Simplified ClockController after clock refactoring