More job cleanups