More clock cleanup: