[delivers #62528062]

You can now remove from active before timer fires and it adds back to
empty, also removed some logs and cleaned up a bit of code