First step in removing time_of_day gem
Finalizing removal of time_of_day gem