Cleanup and complete separation of all date-related code