Clean Up Jobsmap

Clean up jobs map