Remove unnecessary flag check. Test for null timer. Remove unused files