PW: Eliminating ClockTicks array and some lines