Clean up

Clean up districts code