Hopefully last cleanup to Timer