diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml
index e1fae27..d2bdbe1 100644
--- a/spring-cloud-dependencies/pom.xml
+++ b/spring-cloud-dependencies/pom.xml
@@ -17,7 +17,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 		<spring-cloud-bus.version>4.0.0-SNAPSHOT</spring-cloud-bus.version>
 		<spring-cloud-build.version>4.0.0-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-cloudfoundry.version>4.0.0-SNAPSHOT</spring-cloud-cloudfoundry.version>
 		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-circuitbreaker.version>3.0.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
 		<spring-cloud-config.version>4.0.0-SNAPSHOT</spring-cloud-config.version>
@@ -28,12 +27,10 @@
 		<spring-cloud-kubernetes.version>3.0.0-SNAPSHOT</spring-cloud-kubernetes.version>
 		<spring-cloud-netflix.version>4.0.0-SNAPSHOT</spring-cloud-netflix.version>
 		<spring-cloud-openfeign.version>4.0.0-SNAPSHOT</spring-cloud-openfeign.version>
-		<spring-cloud-sleuth.version>4.0.0-SNAPSHOT</spring-cloud-sleuth.version>
 		<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-task.version>3.0.0-SNAPSHOT</spring-cloud-task.version>
 		<spring-cloud-vault.version>4.0.0-SNAPSHOT</spring-cloud-vault.version>
 		<spring-cloud-zookeeper.version>4.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-cli.version>4.0.0-SNAPSHOT</spring-cloud-cli.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -101,13 +98,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-				<version>${spring-cloud-sleuth.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-vault-dependencies</artifactId>
@@ -122,13 +112,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-cloudfoundry-dependencies</artifactId>
-				<version>${spring-cloud-cloudfoundry.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-bus-dependencies</artifactId>
diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml
index c5080d6..fc21958 100644
--- a/spring-cloud-starter-parent/pom.xml
+++ b/spring-cloud-starter-parent/pom.xml
@@ -6,6 +6,7 @@
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-starter-parent</artifactId>
diff --git a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
index 8e87981..6627c95 100644
--- a/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
+++ b/train-docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java
@@ -37,18 +37,17 @@ public class GenerateReleaseTrainDocsTests {
 		List<Project> projects = new GenerateReleaseTrainDocs().mavenPropertiesToDocsProjects(testPom);
 
 		BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-foo-bus", "spring-cloud-foo-build",
-				"spring-cloud-foo-cloudfoundry", "spring-cloud-foo-commons", "spring-cloud-foo-circuitbreaker",
+				"spring-cloud-foo-commons", "spring-cloud-foo-circuitbreaker",
 				"spring-cloud-foo-config", "spring-cloud-foo-consul", "spring-cloud-foo-contract",
 				"spring-cloud-foo-function", "spring-cloud-foo-gateway", "spring-cloud-foo-kubernetes",
-				"spring-cloud-foo-netflix", "spring-cloud-foo-openfeign", "spring-cloud-foo-sleuth",
-				"spring-cloud-foo-task", "spring-cloud-foo-vault", "spring-cloud-foo-zookeeper",
-				"spring-cloud-foo-cli");
+				"spring-cloud-foo-netflix", "spring-cloud-foo-openfeign",
+				"spring-cloud-foo-task", "spring-cloud-foo-vault", "spring-cloud-foo-zookeeper");
 		BDDAssertions.then(projects).contains(new Project("spring-cloud-foo-bus", "2.2.3.RELEASE"));
 	}
 
 	@Test
 	void should_unpack_starters_docs() throws URISyntaxException {
-		File testPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/sleuth-only.xml").toURI());
+		File testPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/commons-only.xml").toURI());
 		File unzippedDocs = new File("target/test-unpacked-docs/");
 		List<Project> projects = new GenerateReleaseTrainDocs().mavenPropertiesToDocsProjects(testPom);
 
@@ -74,19 +73,19 @@ public class GenerateReleaseTrainDocsTests {
 	}
 
 	@Test
-	void should_generate_adocs_from_spring_cloud_sleuth_docs() throws URISyntaxException, IOException {
-		File generatedAdocs = new File("target/test-train-sleuth-docs");
+	void should_generate_adocs_from_spring_cloud_commons_docs() throws URISyntaxException, IOException {
+		File generatedAdocs = new File("target/test-train-commons-docs");
 		FileSystemUtils.deleteRecursively(generatedAdocs);
-		File testPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/sleuth-only.xml").toURI());
+		File testPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/commons-only.xml").toURI());
 		File starterPom = new File(GenerateReleaseTrainDocsTests.class.getResource("/test/starter-pom.xml").toURI());
-		File unzippedDocs = new File("target/test-unpacked-sleuth-docs/");
+		File unzippedDocs = new File("target/test-unpacked-commons-docs/");
 
 		GenerateReleaseTrainDocs.main(testPom.getAbsolutePath(), starterPom.getAbsolutePath(),
 				"https://github.com/spring-cloud/", unzippedDocs.getAbsolutePath(), generatedAdocs.getAbsolutePath());
 
 		BDDAssertions.then(generatedAdocs).isNotEmptyDirectory();
 		BDDAssertions.then(configProps(generatedAdocs))
-				.contains("|spring.sleuth.async.configurer.enabled | `true` | Enable default AsyncConfigurer.");
+				.contains("|spring.cloud.compatibility-verifier.enabled | `false` | Enables creation of Spring Cloud compatibility verification.");
 	}
 
 	private String configProps(File file) throws IOException {
diff --git a/train-docs/src/test/resources/test/sleuth-only.xml b/train-docs/src/test/resources/test/commons-only.xml
similarity index 92%
rename from train-docs/src/test/resources/test/sleuth-only.xml
rename to train-docs/src/test/resources/test/commons-only.xml
index bc4fb62..c7931a4 100644
--- a/train-docs/src/test/resources/test/sleuth-only.xml
+++ b/train-docs/src/test/resources/test/commons-only.xml
@@ -15,7 +15,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<spring-cloud-sleuth.version>3.0.0-SNAPSHOT</spring-cloud-sleuth.version>
+		<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -83,13 +83,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-				<version>${spring-cloud-sleuth.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-vault-dependencies</artifactId>
@@ -104,13 +97,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-cloudfoundry-dependencies</artifactId>
-				<version>${spring-cloud-cloudfoundry.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-bus-dependencies</artifactId>
diff --git a/train-docs/src/test/resources/test/pom.xml b/train-docs/src/test/resources/test/pom.xml
index f7968e6..71cbfb4 100644
--- a/train-docs/src/test/resources/test/pom.xml
+++ b/train-docs/src/test/resources/test/pom.xml
@@ -17,7 +17,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 		<spring-cloud-foo-bus.version>2.2.3.RELEASE</spring-cloud-foo-bus.version>
 		<spring-cloud-foo-build.version>2.3.1.RELEASE</spring-cloud-foo-build.version>
-		<spring-cloud-foo-cloudfoundry.version>2.2.3.RELEASE</spring-cloud-foo-cloudfoundry.version>
 		<spring-cloud-foo-commons.version>2.2.4.RELEASE</spring-cloud-foo-commons.version>
 		<spring-cloud-foo-circuitbreaker.version>1.0.4.RELEASE</spring-cloud-foo-circuitbreaker.version>
 		<spring-cloud-foo-config.version>2.2.4.RELEASE</spring-cloud-foo-config.version>
@@ -28,11 +27,9 @@
 		<spring-cloud-foo-kubernetes.version>1.1.4.RELEASE</spring-cloud-foo-kubernetes.version>
 		<spring-cloud-foo-netflix.version>2.2.4.RELEASE</spring-cloud-foo-netflix.version>
 		<spring-cloud-foo-openfeign.version>2.2.4.RELEASE</spring-cloud-foo-openfeign.version>
-		<spring-cloud-foo-sleuth.version>2.2.4.RELEASE</spring-cloud-foo-sleuth.version>
 		<spring-cloud-foo-task.version>2.2.3.RELEASE</spring-cloud-foo-task.version>
 		<spring-cloud-foo-vault.version>2.2.4.RELEASE</spring-cloud-foo-vault.version>
 		<spring-cloud-foo-zookeeper.version>2.2.3.RELEASE</spring-cloud-foo-zookeeper.version>
-		<spring-cloud-foo-cli.version>2.2.1.RELEASE</spring-cloud-foo-cli.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -100,13 +97,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-sleuth-dependencies</artifactId>
-				<version>${spring-cloud-sleuth.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-vault-dependencies</artifactId>
@@ -121,13 +111,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-cloudfoundry-dependencies</artifactId>
-				<version>${spring-cloud-cloudfoundry.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-bus-dependencies</artifactId>