Removed commented code
Add support for JobSet names