Remove unused imports from download plugin
Make scheduler restartability less hacky