Get rid of some unused code
Cleaning up workflow some
Clean up job settings form