clean up junk towns
Merge branch 'fix_towns'