refactor schedule and remove saving functionality