Tidying up

Removing employer specific cruft ready for $NEW_JOB