Clean up Clock and Date