remove dead code
some guards for job classes