Remove unwanted fields from the census form. Done on the template layer for minimum disruption to existing databases. Closes #419 and #413