Cleaned up the ClockService