Fix time counter bug.
Remove commented code.