More scheduler and some listmanager and related cleanup