Additional changes to DB structure, more census scrubbing code