diff --git a/common/function-test-support/src/main/resources/geode/Dockerfile b/common/function-test-support/src/main/resources/geode/Dockerfile
deleted file mode 100644
index 0df57ed6..00000000
--- a/common/function-test-support/src/main/resources/geode/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM apachegeode/geode:1.13.0
-
-ARG CACHE_SERVER_PORT=40404
-ARG LOCATOR_PORT=10334
-
-EXPOSE ${LOCATOR_PORT} ${CACHE_SERVER_PORT}
diff --git a/common/metadata-store-common/README.adoc b/common/metadata-store-common/README.adoc
index 1adaa540..249ae33e 100644
--- a/common/metadata-store-common/README.adoc
+++ b/common/metadata-store-common/README.adoc
@@ -47,48 +47,6 @@ Additional configuration property for `MongoDbMetadataStore` is:
 
 $$metadata.store.mongo-db.collection$$:: $$MongoDB collection name for metadata.$$ *($$String$$, default: `$$metadataStore$$`)*
 
-==== Pivotal Gemfire / Apache Geode
-
-The `GemfireMetadataStore` requires these dependencies for auto-configuration:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.springframework.integration</groupId>
-    <artifactId>spring-integration-gemfire</artifactId>
-</dependency>
-----
-
-or when your environment is based on the Open Source https://geode.apache.org/[Apache Geode]:
-
-[source,xml]
-----
-<dependency>
-    <groupId>org.springframework.integration</groupId>
-    <artifactId>spring-integration-gemfire</artifactId>
-    <exclusions>
-        <exclusion>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-gemfire</artifactId>
-        </exclusion>
-    </exclusions>
-</dependency>
-<dependency>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-geode</artifactId>
-</dependency>
-----
-
-You also can consider to use https://github.com/spring-projects/spring-boot-data-geode[Spring Boot Data Geode] instead for automatic dependency management and proper Spring Boot auto-configuration for Pivotal Gemfire/Apache Geode.
-
-Additional configuration property for `GemfireMetadataStore` is:
-
-$$metadata.store.gemfire.region$$:: $$Gemfire region name for metadata.$$ *($$String$$, default: `$$MetaData$$`)*
-
-In addition, for the `GemfireMetadataStore`, a `MetadataStoreListener` bean can be configured in the application context to react to the `MetadataStore` events.
-
-A default auto-configured `ClientRegionFactoryBean`, based on the auto-configured `GemFireCache`, bean can be overridden in the target application.
-
 ==== Hazelcast
 
 The `HazelcastMetadataStore` requires regular Spring Boot auto-configuration for https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-caching-provider-hazelcast[Hazelcast] and minimal set of dependencies is like this: