Fixing a bug with removing scheduling conflicts.

The removal was being too greedy and getting rid of everything that was scheduled. Now it is more reasonable and only removes the ones that are actually conflicting.