Remove schedules working - closes #10