diff --git a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
index ae7a110038..726bef8b01 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
@@ -147,11 +147,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/CaptchaApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/CaptchaApiServiceFactory.java
index 394d3a645f..e636efdde4 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/CaptchaApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/CaptchaApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2018-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.CaptchaApiService;
@@ -5,10 +22,10 @@
 
 public class CaptchaApiServiceFactory {
 
-   private final static CaptchaApiService service = new CaptchaApiServiceImpl();
+   private final static CaptchaApiService SERVICE = new CaptchaApiServiceImpl();
 
    public static CaptchaApiService getCaptchaApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ClaimsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ClaimsApiServiceFactory.java
index f1816c4d93..f67f88d06e 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ClaimsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ClaimsApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2016-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.ClaimsApiService;
@@ -5,10 +22,10 @@
 
 public class ClaimsApiServiceFactory {
 
-   private final static ClaimsApiService service = new ClaimsApiServiceImpl();
+   private final static ClaimsApiService SERVICE = new ClaimsApiServiceImpl();
 
    public static ClaimsApiService getClaimsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverPasswordApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverPasswordApiServiceFactory.java
index 5ecacb3fad..ac268b1a98 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverPasswordApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverPasswordApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2016-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApiService;
@@ -5,10 +22,10 @@
 
 public class RecoverPasswordApiServiceFactory {
 
-   private final static RecoverPasswordApiService service = new RecoverPasswordApiServiceImpl();
+   private final static RecoverPasswordApiService SERVICE = new RecoverPasswordApiServiceImpl();
 
    public static RecoverPasswordApiService getRecoverPasswordApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverUsernameApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverUsernameApiServiceFactory.java
index 0725794821..fa79bdc45f 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverUsernameApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/RecoverUsernameApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2016-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApiService;
@@ -5,10 +22,10 @@
 
 public class RecoverUsernameApiServiceFactory {
 
-   private final static RecoverUsernameApiService service = new RecoverUsernameApiServiceImpl();
+   private final static RecoverUsernameApiService SERVICE = new RecoverUsernameApiServiceImpl();
 
    public static RecoverUsernameApiService getRecoverUsernameApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/SetPasswordApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/SetPasswordApiServiceFactory.java
index f64ac1e14a..9c3f0416a1 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/SetPasswordApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/SetPasswordApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2016-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.SetPasswordApiService;
@@ -5,10 +22,10 @@
 
 public class SetPasswordApiServiceFactory {
 
-   private final static SetPasswordApiService service = new SetPasswordApiServiceImpl();
+   private final static SetPasswordApiService SERVICE = new SetPasswordApiServiceImpl();
 
    public static SetPasswordApiService getSetPasswordApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ValidateCodeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ValidateCodeApiServiceFactory.java
index c92db6ae22..5df1bcce01 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ValidateCodeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/src/gen/java/org/wso2/carbon/identity/recovery/endpoint/factories/ValidateCodeApiServiceFactory.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2017-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. 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.
+ */
 package org.wso2.carbon.identity.recovery.endpoint.factories;
 
 import org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApiService;
@@ -5,10 +22,10 @@
 
 public class ValidateCodeApiServiceFactory {
 
-   private final static ValidateCodeApiService service = new ValidateCodeApiServiceImpl();
+   private final static ValidateCodeApiService SERVICE = new ValidateCodeApiServiceImpl();
 
    public static ValidateCodeApiService getValidateCodeApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/src/main/resources/META-INF/cxf/user-recovery-v0-9-cxf.xml b/components/org.wso2.carbon.identity.api.user.recovery/src/main/resources/META-INF/cxf/user-recovery-v0-9-cxf.xml
deleted file mode 100644
index c29bb9e75f..0000000000
--- a/components/org.wso2.carbon.identity.api.user.recovery/src/main/resources/META-INF/cxf/user-recovery-v0-9-cxf.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~  WSO2 Inc. 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.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-
-
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.CaptchaApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.ClaimsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.RecoverPasswordApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.RecoverUsernameApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.SetPasswordApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.recovery.endpoint.impl.ValidateCodeApiServiceImpl"/>
-
-</beans>