finished removing the job_type.  This and the previous commit.