Tidy up clocks