Timer cleanup

remove comments and functions