Cleaning up/fixing timer