Cleanup clocks.py, remove more references