Remove unnecessary code
 - reenable timer
Fixes saveState feature
Merge pull request #130 from bimsarck/master

Remove unnecessary code