diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
index ebf23286c9..029a279ce9 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
@@ -62,6 +62,29 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy v09 api</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt</groupId>
+                                    <artifactId>org.wso2.carbon.certificate.mgt.v09.api
+                                    </artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/webapps
+                                    </outputDirectory>
+                                    <destFileName>api#scep-mgt#v0.9.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf
index 0c0b0d046e..032bdc18aa 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf
@@ -1,2 +1,3 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.api_${feature.version}/webapps/api#scep-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v1.0.war,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.api_${feature.version}/webapps/api#scep-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.api_${feature.version}/webapps/api#scep-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
index 653f467f37..f53ede9aa4 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
@@ -62,6 +62,29 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy v09 api</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt</groupId>
+                                    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.v09.api
+                                    </artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/webapps
+                                    </outputDirectory>
+                                    <destFileName>api#certificate-mgt#v0.9.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf
index b9e7e512bc..f74151bd01 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf
@@ -1,2 +1,3 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.cert.admin.api_${feature.version}/webapps/api#certificate-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v1.0.war,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.cert.admin.api_${feature.version}/webapps/api#certificate-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.cert.admin.api_${feature.version}/webapps/api#certificate-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/pom.xml
deleted file mode 100644
index f8d317e945..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~ *  Copyright (c) ${date}, 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.
-  ~ */
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>certificate-mgt-feature</artifactId>
-        <version>3.0.185-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Admin Certificate Management v0.9 API Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the v0.9 APIs required for Admin Certificate Management.</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.v09.api
-                                    </artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/webapps
-                                    </outputDirectory>
-                                    <destFileName>api#certificate-mgt#v0.9.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>build.properties</include>
-                                        <include>p2.inf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.certificate.mgt.cert.admin.v09.api</id>
-                            <propertiesFile>../../../features/etc/feature.properties
-                            </propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server
-                                    </propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
-                                    </propertyDef>
-                                </properties>
-                            </adviceFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/build.properties b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/build.properties
deleted file mode 100644
index 9c86577d76..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/p2.inf
deleted file mode 100644
index 702771b5ec..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.cert.admin.v09.api_${feature.version}/webapps/api#certificate-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
index 017fb34561..5b3fcd66c0 100644
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
@@ -9,7 +9,7 @@
   ~
   ~   http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing,
+  ~ Unless required by mciapplicable 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
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/pom.xml
deleted file mode 100644
index 4985c884c8..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~ *  Copyright (c) ${date}, 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.
-  ~ */
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>certificate-mgt-feature</artifactId>
-        <version>3.0.185-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.v09.api.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Certificate Management v0.9 API Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the v0.9 APIs required for Certificate Management.</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.certificate.mgt.v09.api
-                                    </artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/webapps
-                                    </outputDirectory>
-                                    <destFileName>api#scep-mgt#v0.9.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>build.properties</include>
-                                        <include>p2.inf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.certificate.mgt.v09.api</id>
-                            <propertiesFile>../../../features/etc/feature.properties
-                            </propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server
-                                    </propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
-                                    </propertyDef>
-                                </properties>
-                            </adviceFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/build.properties b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/build.properties
deleted file mode 100644
index 9c86577d76..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/p2.inf
deleted file mode 100644
index cf6df69050..0000000000
--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.v09.api.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.v09.api_${feature.version}/webapps/api#scep-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml
index c3c27c3769..304fabed8f 100644
--- a/features/certificate-mgt/pom.xml
+++ b/features/certificate-mgt/pom.xml
@@ -37,9 +37,7 @@
     <modules>
         <module>org.wso2.carbon.certificate.mgt.server.feature</module>
         <module>org.wso2.carbon.certificate.mgt.api.feature</module>
-        <module>org.wso2.carbon.certificate.mgt.v09.api.feature</module>
         <module>org.wso2.carbon.certificate.mgt.cert.admin.api.feature</module>
-        <module>org.wso2.carbon.certificate.mgt.cert.admin.v09.api.feature</module>
     </modules>
 
 </project>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
index eec9f78066..44d78979fb 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
@@ -62,6 +62,29 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy v09 api</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt</groupId>
+                                    <artifactId>org.wso2.carbon.device.mgt.v09.api
+                                    </artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/webapps
+                                    </outputDirectory>
+                                    <destFileName>api#device-mgt#v0.9.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf
index e0423d3cc3..fea8965f73 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf
@@ -1,3 +1,4 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.api_${feature.version}/webapps/api#device-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v1.0.war,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.api_${feature.version}/webapps/api#device-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.api_${feature.version}/webapps/api#device-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
index 3a71520fbf..3743150152 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>org.wso2.carbon.device.mgt.api.feature</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.v09.api.feature</artifactId>
-            <type>zip</type>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.url.printer</artifactId>
@@ -118,9 +113,6 @@
                                 <includedFeatureDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.api.feature:${carbon.device.mgt.version}
                                 </includedFeatureDef>
-                                <includedFeatureDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.v09.api.feature:${carbon.device.mgt.version}
-                                </includedFeatureDef>
                             </includedFeatures>
                             <bundles>
 								<bundleDef>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/pom.xml
deleted file mode 100644
index 02c4046c8b..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ /*
-  ~ *  Copyright (c) ${date}, 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.
-  ~ */
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.185-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.v09.api.feature</artifactId>
-    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management v0.9 API Feature</name>
-    <url>http://wso2.org</url>
-    <description>This feature contains the v0.9 APIs required for Device Management console UI</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt</groupId>
-                                    <artifactId>org.wso2.carbon.device.mgt.v09.api
-                                    </artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/webapps
-                                    </outputDirectory>
-                                    <destFileName>api#device-mgt#v0.9.war</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>build.properties</include>
-                                        <include>p2.inf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>p2-feature-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-feature-gen</goal>
-                        </goals>
-                        <configuration>
-                            <id>org.wso2.carbon.device.mgt.v09.api</id>
-                            <propertiesFile>../../../features/etc/feature.properties
-                            </propertiesFile>
-                            <adviceFile>
-                                <properties>
-                                    <propertyDef>org.wso2.carbon.p2.category.type:server
-                                    </propertyDef>
-                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
-                                    </propertyDef>
-                                </properties>
-                            </adviceFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/build.properties b/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/build.properties
deleted file mode 100644
index 9c86577d76..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/p2.inf
deleted file mode 100644
index ada11f0367..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.v09.api.feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.v09.api_${feature.version}/webapps/api#device-mgt#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v0.9.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml
index 8bb7d840d8..951a74fe3a 100644
--- a/features/device-mgt/pom.xml
+++ b/features/device-mgt/pom.xml
@@ -37,7 +37,6 @@
         <module>org.wso2.carbon.device.mgt.server.feature</module>
         <module>org.wso2.carbon.device.mgt.ui.feature</module>
         <module>org.wso2.carbon.device.mgt.api.feature</module>
-        <module>org.wso2.carbon.device.mgt.v09.api.feature</module>
         <module>org.wso2.carbon.device.mgt.feature</module>
         <module>org.wso2.carbon.device.mgt.extensions.feature</module>
         <module>org.wso2.carbon.device.mgt.analytics.data.publisher.feature</module>