diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
deleted file mode 100644
index 783aa430c6..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/pom.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-
-
-
-
-
-
- certificate-mgt
- org.wso2.carbon.devicemgt
- 3.2.2-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
- org.wso2.carbon.certificate.mgt.v09.api
- war
- WSO2 Carbon - Certificate Management v09 API
- WSO2 Carbon - Certificate Management v09 API
- http://wso2.org
-
-
-
-
- maven-compiler-plugin
-
- 1.8
- 1.8
-
-
-
- maven-war-plugin
-
- WEB-INF/lib/*cxf*.jar
- api#scep-mgt#v0.9
-
-
-
- org.jacoco
- jacoco-maven-plugin
-
- ${basedir}/target/coverage-reports/jacoco-unit.exec
-
-
-
- jacoco-initialize
-
- prepare-agent
-
-
-
- jacoco-site
- test
-
- report
-
-
- ${basedir}/target/coverage-reports/jacoco-unit.exec
- ${basedir}/target/coverage-reports/site
-
-
-
-
-
-
-
-
-
- deploy
-
- compile
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.7
-
-
- compile
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- client
-
- test
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 1.2.1
-
-
- test
-
- java
-
-
-
-
-
-
-
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
-
-
- commons-codec.wso2
- commons-codec
-
-
- commons-codec
- commons-codec
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxrs
-
-
- org.apache.cxf
- cxf-rt-transports-http
-
-
- junit
- junit
- test
-
-
- javax.ws.rs
- jsr311-api
- provided
-
-
- org.wso2.carbon
- org.wso2.carbon.logging
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.certificate.mgt.core
- provided
-
-
- io.swagger
- swagger-annotations
-
-
- io.swagger
- swagger-core
-
-
- org.wso2.orbit.com.fasterxml.jackson.core
- jackson-annotations
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- io.swagger
- swagger-jaxrs
-
-
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- javax.servlet
- javax.servlet-api
- provided
-
-
- org.wso2.carbon.devicemgt
- org.wso2.carbon.apimgt.annotations
- provided
-
-
-
-
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
deleted file mode 100644
index 8fca257828..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/CertificateMgtService.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *
- * Copyright (c) 2017, 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.certificate.mgt.jaxrs.api;
-
-import io.swagger.annotations.*;
-
-import org.wso2.carbon.apimgt.annotations.api.Scope;
-import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.certificate.mgt.jaxrs.beans.ErrorResponse;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-@SwaggerDefinition(
- info = @Info(
- version = "0.9.0",
- title = "",
- extensions = {
- @Extension(properties = {
- @ExtensionProperty(name = "name", value = "SCEP Management"),
- @ExtensionProperty(name = "context", value = "/api/device-mgt/v0.9/scep"),
- })
- }
- ),
- tags = {
- @Tag(name = "scep_management", description = "SCEP management related REST-API. " +
- "This can be used to manipulated device " +
- "certificate related details.")
- }
-)
-@Path("/scep")
-@Api(value = "SCEP Management", description = "This API carries all device Certificate management " +
- "related operations.")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-@Scopes(scopes = {
- @Scope(
- name = "Sign CSR",
- description = "Sign CSR",
- key = "perm:sign-csr",
- permissions = {"/device-mgt/certificates/manage"}
- )
-}
-)
-public interface CertificateMgtService {
-
- String SCOPE = "scope";
-
- /**
- * Sign the client's certificate signing request and save it in the database.
- *
- * @param binarySecurityToken Base64 encoded Certificate signing request.
- * @return X509Certificate type sign certificate.
- */
- @POST
- @Path("/sign-csr")
- @Produces(MediaType.TEXT_PLAIN)
- @Consumes(MediaType.TEXT_PLAIN)
- @ApiOperation(
- consumes = MediaType.TEXT_PLAIN,
- produces = MediaType.TEXT_PLAIN,
- httpMethod = "POST",
- value = "Process a given CSR and return signed certificates.",
- notes = "This will return a signed certificate upon a given CSR.",
- tags = "Device Management",
- extensions = {
- @Extension(properties = {
- @ExtensionProperty(name = SCOPE, value = "perm:sign-csr")
- })
- }
- )
- @ApiResponses(
- value = {
- @ApiResponse(
- code = 200,
- message = "OK. \n Successfully fetched the device location.",
- response = String.class),
- @ApiResponse(
- code = 304,
- message = "Not Modified. \n " +
- "Empty body because the client already has the latest version of the requested resource."),
- @ApiResponse(
- code = 500,
- message = "Internal Server Error. \n Error occurred while retrieving signed certificate.",
- response = ErrorResponse.class)
- })
- Response getSignedCertFromCSR(
- @ApiParam(
- name = "If-Modified-Since",
- value = "Validates if the requested variant has not been modified since the time specified",
- required = false)
- @HeaderParam("If-Modified-Since") String ifModifiedSince,
- String binarySecurityToken);
-}
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java
deleted file mode 100644
index 0ba212c2b6..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2017, 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.certificate.mgt.jaxrs.api.common;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-
-@Produces({ "application/json", "application/xml" })
-public class ErrorHandler implements ExceptionMapper {
-
- public Response toResponse(MDMAPIException exception) {
- ErrorMessage errorMessage = new ErrorMessage();
- errorMessage.setErrorMessage(exception.getErrorMessage());
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errorMessage).build();
- }
-}
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java
deleted file mode 100644
index d334fd88e8..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/ErrorMessage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017, 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.certificate.mgt.jaxrs.api.common;
-
-
-public class ErrorMessage {
-
- private String errorMessage;
- private String errorCode;
-
- public String getErrorMessage() {
- return errorMessage;
- }
-
- public void setErrorMessage(String errorMessage) {
- this.errorMessage = errorMessage;
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(String errorCode) {
- this.errorCode = errorCode;
- }
-}
diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java
deleted file mode 100644
index ff866606ad..0000000000
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2017, 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.certificate.mgt.jaxrs.api.common;
-
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-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.*;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
-@Provider
-@Produces(APPLICATION_JSON)
-@Consumes(APPLICATION_JSON)
-public class GsonMessageBodyHandler implements MessageBodyWriter