diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
index 12e532674..455c20655 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerBootApp.java
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
@@ -51,9 +50,6 @@ import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnec
 import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnectorRemote.RemoteBootAppData;
 import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessConnectorService;
 import org.springframework.ide.vscode.boot.java.livehover.v2.SpringProcessLiveDataProvider;
-import org.springframework.ide.vscode.boot.java.rewrite.RewriteCompilationUnitCache;
-import org.springframework.ide.vscode.boot.java.rewrite.RewriteRecipeRepository;
-import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings;
 import org.springframework.ide.vscode.boot.java.utils.CompilationUnitCache;
 import org.springframework.ide.vscode.boot.java.utils.SymbolCache;
 import org.springframework.ide.vscode.boot.java.utils.SymbolCacheOnDisc;
@@ -294,21 +290,6 @@ public class BootLanguageServerBootApp {
 		return new FutureProjectFinder(projectFinder, projectObserver);
 	}
 	
-	@ConditionalOnMissingClass("org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness")
-	@Bean RewriteRecipeRepository rewriteRecipesRepository(SimpleLanguageServer server, JavaProjectFinder projectFinder, BootJavaConfig config) {
-		return new RewriteRecipeRepository(server, projectFinder, config);
-	}
-	
-	@ConditionalOnBean(RewriteRecipeRepository.class)
-	@Bean RewriteCompilationUnitCache orcuCache(SimpleLanguageServer server, BootLanguageServerParams params) {
-		return new RewriteCompilationUnitCache(params.projectFinder, server, params.projectObserver);
-	}
-	
-	@ConditionalOnBean(RewriteRecipeRepository.class)
-	@Bean RewriteRefactorings rewriteRefactorings(SimpleLanguageServer server, JavaProjectFinder projectFinder, RewriteRecipeRepository recipeRepo, RewriteCompilationUnitCache cuCache) {
-		return new RewriteRefactorings(server.getTextDocumentService(), projectFinder, recipeRepo, cuCache);
-	}
-	
 	@Bean
 	ServerCapabilityInitializer bootServerCapabilitiesInitializer() {
 		return (InitializeParams params, ServerCapabilities cap) -> {
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteConfig.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteConfig.java
index d4708ebee..da24986bc 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteConfig.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteConfig.java
@@ -10,9 +10,8 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.app;
 
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.ide.vscode.boot.java.rewrite.RewriteCodeActionHandler;
@@ -21,17 +20,25 @@ import org.springframework.ide.vscode.boot.java.rewrite.RewriteRecipeRepository;
 import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings;
 import org.springframework.ide.vscode.boot.java.rewrite.SpringBootUpgrade;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
-import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixRegistry;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 
-@Configuration
-public class RewriteConfig implements InitializingBean {
+@Configuration(proxyBeanMethods = false)
+public class RewriteConfig {
 
-	@Autowired
-	private SimpleLanguageServer server;
-
-	@Autowired(required = false)
-	private RewriteRefactorings rewriteRefactorings;
+	@ConditionalOnMissingClass("org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness")
+	@Bean RewriteRecipeRepository rewriteRecipesRepository(SimpleLanguageServer server, JavaProjectFinder projectFinder, BootJavaConfig config) {
+		return new RewriteRecipeRepository(server, projectFinder, config);
+	}
+	
+	@ConditionalOnBean(RewriteRecipeRepository.class)
+	@Bean RewriteCompilationUnitCache orcuCache(SimpleLanguageServer server, BootLanguageServerParams params) {
+		return new RewriteCompilationUnitCache(params.projectFinder, server, params.projectObserver);
+	}
+	
+	@ConditionalOnBean(RewriteRecipeRepository.class)
+	@Bean RewriteRefactorings rewriteRefactorings(SimpleLanguageServer server, JavaProjectFinder projectFinder, RewriteRecipeRepository recipeRepo, RewriteCompilationUnitCache cuCache) {
+		return new RewriteRefactorings(server.getTextDocumentService(), projectFinder, recipeRepo, cuCache);
+	}
 	
 	@ConditionalOnBean(RewriteRecipeRepository.class)
 	@Bean RewriteCodeActionHandler rewriteCodeActionHandler(RewriteCompilationUnitCache cuCache, RewriteRecipeRepository recipeRepo, BootJavaConfig config) {
@@ -43,12 +50,4 @@ public class RewriteConfig implements InitializingBean {
 		return new SpringBootUpgrade(server, recipeRepo, projectFinder);
 	}
 	
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		if (rewriteRefactorings != null) {
-			QuickfixRegistry registry = server.getQuickfixRegistry();
-			registry.register(RewriteRefactorings.REWRITE_RECIPE_QUICKFIX, rewriteRefactorings);
-		}
-	}
-
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteInitializer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteInitializer.java
new file mode 100644
index 000000000..37c8d4fb2
--- /dev/null
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/RewriteInitializer.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2023 VMware, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VMware, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.ide.vscode.boot.app;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.ide.vscode.boot.java.rewrite.RewriteRefactorings;
+import org.springframework.ide.vscode.commons.languageserver.quickfix.QuickfixRegistry;
+import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
+
+@Configuration(proxyBeanMethods = false)
+public class RewriteInitializer implements InitializingBean {
+	
+	@Autowired
+	private SimpleLanguageServer server;
+
+	@Autowired(required = false)
+	private RewriteRefactorings rewriteRefactorings;
+	
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		if (rewriteRefactorings != null) {
+			QuickfixRegistry registry = server.getQuickfixRegistry();
+			registry.register(RewriteRefactorings.REWRITE_RECIPE_QUICKFIX, rewriteRefactorings);
+		}
+	}
+
+}