Remove unnecessary code
 - reenable timer