diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
index 309d5eb13..22980b4d6 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ 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
@@ -28,11 +28,6 @@
     <artifactId>org.wso2.carbon.identity.api.user.functionality.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.user.functionality.mgt</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
index c1ebc51e7..45146f540 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.functionality.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -26,8 +27,21 @@
  */
 public class UserFunctionalityServiceHolder {
 
-    private static UserFunctionalityManager userFunctionalityManager;
-    private static RealmService realmService;
+    private UserFunctionalityServiceHolder() {
+
+    }
+
+    private static class UserFunctionalityManagerServiceHolder {
+
+        static final UserFunctionalityManager SERVICE = (UserFunctionalityManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserFunctionalityManager.class, null);
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
+    }
 
     /**
      * Get UserFunctionalityManager osgi service.
@@ -36,26 +50,16 @@ public class UserFunctionalityServiceHolder {
      */
     public static UserFunctionalityManager getuserFunctionalityManager() {
 
-        return userFunctionalityManager;
+        return UserFunctionalityManagerServiceHolder.SERVICE;
     }
 
     /**
-     * Set UserFunctionalityManager osgi service.
+     * Get RealmService osgi service.
      *
-     * @param userFunctionalityManager UserFunctionalityManager
+     * @return RealmService
      */
-    public static void setUserFunctionalityManager(UserFunctionalityManager userFunctionalityManager) {
-
-        UserFunctionalityServiceHolder.userFunctionalityManager = userFunctionalityManager;
-    }
-
     public static RealmService getRealmService() {
 
-        return realmService;
-    }
-
-    public static void setRealmService(RealmService realmService) {
-
-        UserFunctionalityServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index fcbaecdba..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020, 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.
- */
-
-package org.wso2.carbon.identity.api.user.functionality.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java
deleted file mode 100644
index d8171ab1b..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, 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.
- */
-
-package org.wso2.carbon.identity.api.user.functionality.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserFunctionalityManager type of object inside the container.
- */
-public class UserFunctionalityMgtOSGIServiceFactory extends AbstractFactoryBean<UserFunctionalityManager> {
-
-    private UserFunctionalityManager userFunctionalityManager;
-
-    @Override
-    public Class<UserFunctionalityManager> getObjectType() {
-
-        return UserFunctionalityManager.class;
-    }
-
-    @Override
-    protected UserFunctionalityManager createInstance() throws Exception {
-
-        if (this.userFunctionalityManager == null) {
-            UserFunctionalityManager userFunctionalityManager = (UserFunctionalityManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(UserFunctionalityManager.class, null);
-            if (userFunctionalityManager != null) {
-                this.userFunctionalityManager = userFunctionalityManager;
-            } else {
-                throw new Exception("Unable to retrieve UserFunctionalityManager service.");
-            }
-        }
-        return this.userFunctionalityManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
index 5c474ea56..57f90acbd 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ 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
@@ -40,11 +40,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.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
index 544288c36..b13a4945a 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
@@ -1,31 +1,32 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed 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.
-*/
+ * Copyright (c) 2020-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.rest.api.user.functionality.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.UserStatusChangeRequest;
-import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -39,8 +40,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @PUT
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
index be360ebbc..e6fd74333 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -18,8 +18,7 @@
 
 package org.wso2.carbon.identity.rest.api.user.functionality.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserIdApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
@@ -34,8 +33,12 @@
 
 public class UserIdApi {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi() {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @PUT
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
index 7c90277f7..a98ab8799 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed 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.
-*/
+ * Copyright (c) 2020-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.rest.api.user.functionality.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+    /**
+     * Get MeApiService service.
+     *
+     * @return MeApiService
+     */
+    public static MeApiService getMeApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
index 9ea7a8f78..df8439360 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.UserIdApiServiceImpl;
 
+/**
+ * Factory class for UserIdApiService.
+ */
 public class UserIdApiServiceFactory {
 
-   private final static UserIdApiService service = new UserIdApiServiceImpl();
+    private final static UserIdApiService SERVICE = new UserIdApiServiceImpl();
+
+    /**
+     * Get UserIdApiService service.
+     *
+     * @return UserIdApiService
+     */
+    public static UserIdApiService getUserIdApi() {
 
-   public static UserIdApiService getUserIdApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
index 26531bffa..28b01f8c8 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -26,7 +26,6 @@
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
 import org.wso2.carbon.identity.api.user.functionality.common.Constants;
-import org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder;
 import org.wso2.carbon.identity.application.common.model.User;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
@@ -36,6 +35,7 @@
 import org.wso2.carbon.identity.user.functionality.mgt.exception.UserFunctionalityManagementClientException;
 import org.wso2.carbon.identity.user.functionality.mgt.exception.UserFunctionalityManagementException;
 import org.wso2.carbon.identity.user.functionality.mgt.model.FunctionalityLockStatus;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import javax.ws.rs.core.Response;
 
@@ -48,8 +48,17 @@
  */
 public class UserFunctionalityService {
 
+    private final UserFunctionalityManager userFunctionalityManager;
+    private final RealmService realmService;
+
     private static final Log log = LogFactory.getLog(UserFunctionalityService.class);
 
+    public UserFunctionalityService(UserFunctionalityManager userFunctionalityManager, RealmService realmService) {
+
+        this.userFunctionalityManager = userFunctionalityManager;
+        this.realmService = realmService;
+    }
+
     /**
      * Lock or Unlock a functionality of a user by a privileged user.
      *
@@ -91,8 +100,6 @@ public Response lock(String userId, String functionalityIdentifier, StatusChange
             if (statusChangeRequest.getTimeToLock() != null) {
                 unlockTime = Long.parseLong(statusChangeRequest.getTimeToLock());
             }
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             userFunctionalityManager.lock(userId,
                     tenantId, functionalityIdentifier, unlockTime,
                     statusChangeRequest.getFunctionalityLockReasonCode(),
@@ -119,8 +126,6 @@ public Response unlock(String userId, String functionalityIdentifier) {
 
         try {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             userFunctionalityManager.unlock(userId,
                     tenantId, functionalityIdentifier);
             userFunctionalityManager.deleteAllPropertiesForUser(userId, tenantId, functionalityIdentifier);
@@ -147,9 +152,8 @@ public LockStatusResponse getLockStatus(String userId, String functionalityIdent
         try {
             LockStatusResponse lockStatusResponse;
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            FunctionalityLockStatus functionalityLockStatus =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager().getLockStatus(userId,
-                            tenantId, functionalityIdentifier);
+            FunctionalityLockStatus functionalityLockStatus = userFunctionalityManager.getLockStatus(userId,
+                    tenantId, functionalityIdentifier);
             lockStatusResponse = new FunctionalityLockStatusToExternal().apply(functionalityLockStatus);
             return lockStatusResponse;
         } catch (UserFunctionalityManagementException e) {
@@ -195,8 +199,6 @@ public Response unlockLoggedInUser(String userId, String functionalityIdentifier
 
         try {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
 
             FunctionalityLockStatus lockStatus = userFunctionalityManager.getLockStatus(userId, tenantId,
                     functionalityIdentifier);
@@ -236,8 +238,6 @@ public Response lockLoggedInUser(String userId, String functionalityIdentifier,
             if (userStatusChangeRequest.getTimeToLock() != null) {
                 unlockTime = Long.parseLong(userStatusChangeRequest.getTimeToLock());
             }
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             FunctionalityLockStatus status = userFunctionalityManager.getLockStatus(userId, tenantId,
                     functionalityIdentifier);
             if (status.getLockStatus() && !StringUtils.equals(status.getLockReasonCode(),
@@ -275,8 +275,6 @@ public LockStatusResponse getLockStatusOfLoggedInUser(String functionalityIdenti
             String userId = getUserIdFromUser(getUserFromContext());
             LockStatusResponse lockStatusResponse;
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             FunctionalityLockStatus functionalityLockStatus = userFunctionalityManager
                     .getLockStatus(userId, tenantId, functionalityIdentifier);
             lockStatusResponse = new FunctionalityLockStatusToExternal().apply(functionalityLockStatus);
@@ -321,6 +319,6 @@ private static APIError handleError(Response.Status status, Constants.ErrorMessa
 
     private String getUserIdFromUser(User user) {
 
-        return new UserToUniqueId().apply(UserFunctionalityServiceHolder.getRealmService(), user);
+        return new UserToUniqueId().apply(realmService, user);
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java
new file mode 100644
index 000000000..dc63c52b3
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 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.rest.api.user.functionality.v1.factories;
+
+import org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for UserFunctionalityService.
+ */
+public class UserFunctionalityServiceFactory {
+
+    private UserFunctionalityServiceFactory() {
+
+    }
+
+    private static class UserFunctionalityServicesHolder {
+
+        private static final UserFunctionalityService SERVICE = createServiceInstance();
+    }
+
+    private static UserFunctionalityService createServiceInstance() {
+
+        UserFunctionalityManager userFunctionalityManager = getUserFunctionalityManager();
+        RealmService realmService = getRealmService();
+
+        return new UserFunctionalityService(userFunctionalityManager, realmService);
+    }
+
+    /**
+     * Get UserFunctionalityService service.
+     *
+     * @return UserFunctionalityService
+     */
+    public static UserFunctionalityService getUserFunctionalityService() {
+
+        return UserFunctionalityServicesHolder.SERVICE;
+    }
+
+    private static UserFunctionalityManager getUserFunctionalityManager() {
+
+        UserFunctionalityManager service = UserFunctionalityServiceHolder.getuserFunctionalityManager();
+        if (service == null) {
+            throw new IllegalStateException("UserFunctionalityManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = UserFunctionalityServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
index 231c4d99c..2e0ee0705 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed 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.
-*/
+ * Copyright (c) 2020-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.rest.api.user.functionality.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserFunctionalityServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.UserStatusChangeRequest;
 
 import javax.ws.rs.core.Response;
@@ -28,8 +30,17 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    private UserFunctionalityService userFunctionalityService;
+    private final UserFunctionalityService userFunctionalityService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.userFunctionalityService = UserFunctionalityServiceFactory.getUserFunctionalityService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "UserFunctionalityService.", e);
+        }
+    }
 
     @Override
     public Response changeStatusOfLoggedInUser(String functionId, UserStatusChangeRequest userStatusChangeRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
index c36d6332e..e7ce901e5 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.functionality.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserFunctionalityServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
 
 import javax.ws.rs.core.Response;
@@ -30,8 +30,17 @@
  */
 public class UserIdApiServiceImpl implements UserIdApiService {
 
-    @Autowired
-    private UserFunctionalityService userFunctionalityService;
+    private final UserFunctionalityService userFunctionalityService;
+
+    public UserIdApiServiceImpl() {
+
+        try {
+            this.userFunctionalityService = UserFunctionalityServiceFactory.getUserFunctionalityService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "UserFunctionalityService.", e);
+        }
+    }
 
     @Override
     public Response changeStatus(String functionId, String userId, StatusChangeRequest statusChangeRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml
deleted file mode 100644
index a7996d9f3..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-  ~ Copyright (c) 2020, 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.MeApiServiceImpl"/>
-    <bean id="userFunctionalityManager"
-          class="org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder">
-        <property name="userFunctionalityManager" ref="userFunctionalityServiceFactoryBean"/>
-        <property name="realmService" ref="realmServiceOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="userFunctionalityServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.functionality.common.factory.UserFunctionalityMgtOSGIServiceFactory"/>
-    <bean id="realmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.functionality.common.factory.RealmServiceOSGIServiceFactory"/>
-</beans>