BREAKING CHANGE - contains

This is a breaking change, it removes `contains` and thus GeoStore is broken.

DO NOT MERGE UNTIL GEOSTORE IS FIXED.