There is a repeating pattern of code that removes the timer if it's not
needed.  So let's move it to a new function.  We'll also use it later.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>