Move some fns from job into tasks
Clean up some imports
Remove unused imports