Cleaned up department fields and references
Merge branch 'james'