Revert "Changes for Schedule"

This reverts commit 20987a8490c34fa02267eeac8c35d29eb61cf670.