scheduler api cleanups