Cleaning up the Employment code & CIRCS content changes