Geography rule: more updates

+ clean up some files