diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml
deleted file mode 100644
index e7981827f7..0000000000
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
- application-mgt
- io.entgra.device.mgt.core
- 5.0.26-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
- io.entgra.device.mgt.core.application.mgt.addons
- Entgra - Application Management Add-Ons
- Entgra - Application Management Add-Ons
- https://entgra.io
-
-
-
-
- org.apache.felix
- maven-scr-plugin
-
-
- org.apache.felix
- maven-bundle-plugin
- 1.4.0
- true
-
-
- ${project.artifactId}
- ${project.artifactId}
- ${io.entgra.device.mgt.core.version}
- Application Management Add-Ons Bundle
-
- com.google.gson,
- io.swagger.annotations.*;resolution:=optional
-
-
- io.entgra.device.mgt.core.application.mgt.addons.*
-
-
-
-
-
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
- provided
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxrs
- provided
-
-
- org.apache.cxf
- cxf-rt-transports-http
- provided
-
-
- org.eclipse.osgi
- org.eclipse.osgi
-
-
- org.eclipse.equinox
- org.eclipse.equinox.common
-
-
- org.wso2.carbon
- org.wso2.carbon.logging
-
-
- commons-codec.wso2
- commons-codec
-
-
- commons-io.wso2
- commons-io
-
-
- io.swagger
- swagger-annotations
- provided
-
-
- org.json.wso2
- json
-
-
- com.google.code.gson
- gson
-
-
- io.entgra.device.mgt.core
- io.entgra.device.mgt.core.application.mgt.common
-
-
- javax.servlet
- javax.servlet-api
- provided
-
-
- org.hibernate
- hibernate-validator
-
-
-
diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java
deleted file mode 100644
index 5e732b40ee..0000000000
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/ApiOriginFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. 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 io.entgra.device.mgt.core.application.mgt.addons;
-
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class ApiOriginFilter implements Filter {
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
- HttpServletResponse res = (HttpServletResponse) response;
- res.addHeader("Access-Control-Allow-Origin", "*");
- res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
- res.addHeader("Access-Control-Allow-Headers", "Content-Type");
- chain.doFilter(request, response);
- }
-
- public void destroy() {
- //do nothing
- }
-
- public void init(FilterConfig filterConfig) throws ServletException {
- //do nothing
- }
-}
\ No newline at end of file
diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java
deleted file mode 100644
index 49e11de0ba..0000000000
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/FileStreamingOutput.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. 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 io.entgra.device.mgt.core.application.mgt.addons;
-
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * io.entgra.device.mgt.core.application.mgt.addons.FileStreamingOutput to allow the user to send the files as Stream.
- */
-public class FileStreamingOutput implements StreamingOutput {
- private InputStream inputStream;
-
- public FileStreamingOutput(InputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- @Override
- public void write(OutputStream outputStream) throws IOException, WebApplicationException {
- try {
- byte[] buffer = new byte[inputStream.available()];
- inputStream.read(buffer);
- outputStream.write(buffer);
- outputStream.flush();
- } finally {
- if (inputStream != null) {
- inputStream.close();
- }
- if (outputStream != null) {
- outputStream.close();
- }
- }
-
- }
-}
diff --git a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java b/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java
deleted file mode 100644
index 72fe1bb5f5..0000000000
--- a/components/application-mgt/io.entgra.device.mgt.core.application.mgt.addons/src/main/java/io/entgra/device/mgt/core/application/mgt/addons/JSONMessageHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
- *
- * Entgra (Pvt) Ltd. 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 io.entgra.device.mgt.core.application.mgt.addons;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import io.entgra.device.mgt.core.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
-/**
- * This provider is used to change a JSON object to complex object and inversely in request and response.
- */
-@Provider
-@Produces(APPLICATION_JSON)
-@Consumes(APPLICATION_JSON)
-public class JSONMessageHandler implements MessageBodyWriter