Removed unused code, removed job IDs - will re-add after refactor.