removing p.geocode from the core toolset