Revert non-geoMetadata code