Strip _geometry if _cluster is present. Add tests.