Clean up scheduler top-level
Promote neu