cleanup and job bugfix