Remove an odd tuple
Refine dependencies
Simplify 'free scheduling' code