Cleanup scheduler internals