prefectures as a thing, more cleanup