Removing job-specific stuff