Clean up the County/Position memberships
More refactoring on importers