Remove more unneeded clock code