removed timer and some ocd refactoring