Finish configuration defaults and commands, removed scheduler references