Deleted timer-class. Deleted outcommented stuff
merge it