Adding police districts, cleaning up