Tidied up code and added new method to CensusManagerBean
intermediate save before deleting during refactor
Multiple refactors - some normalization and some denormalization of
model. Overall better; less tangled logic.