re #845 - Lets do some housekeeping and remove some unused fields
Merge branch 'feature/845-districts' into staging