Cleanup of Timer mostly

Removed things that isnt used as to get the code a bit more clean.