Revert "AnalogClock unified"

This reverts commit 4fa8bdd78424657a8f3254c4f53b528d625783ef.