Added 12-hour clock

Removed unnecessary code, and reintroduced 12-hour clock.