Deletion of Clock and Date

Removed the clock and date types, and used Calendar and Time instead.