Clocks demo clean up