- Remove more debugging code
! Correct a reference to a timer so that it can be cleared