Clock cleanup