Cleanup geocode code