Fix away timer
Cleanup