Cleaning
Added lock and optimization to play timer, removed obsolete imports