remove some cruft and break up some methods these should actually have classes extracted from district export