diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
index 401ad66f4e..a934c7dc4c 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
@@ -107,9 +107,9 @@
 								<bundleDef>
 									org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.client:${project.version}
 								</bundleDef>
-								<!--<bundleDef>-->
-									<!--org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.generated.client:${project.version}-->
-								<!--</bundleDef>-->
+								<bundleDef>
+									org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.generated.client:${project.version}
+								</bundleDef>
 							</bundles>
 						</configuration>
 					</execution>
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
index ff54fb9cb8..067a6af7f8 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
@@ -24,7 +24,7 @@
 <WebappPublisherConfigs>
 
     <!-- This host is used to define the host address which is used to publish APIs -->
-    <Host>https://localhost:9443</Host>
+    <Host>https://${iot.core.host}:${iot.core.https.port}</Host>
 
     <!-- If it is true, the APIs of this instance will be published to the defined host -->
     <PublishAPI>true</PublishAPI>
diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml
index 956fdf8d49..3561b8c4d6 100644
--- a/features/apimgt-extensions/pom.xml
+++ b/features/apimgt-extensions/pom.xml
@@ -35,10 +35,8 @@
     <url>http://wso2.org</url>
 
     <modules>
-		<!--<module>org.wso2.carbon.apimgt.integration.client.feature</module>-->
         <module>org.wso2.carbon.apimgt.webapp.publisher.feature</module>
         <module>org.wso2.carbon.apimgt.application.extension.feature</module>
-        <!--<module>org.wso2.carbon.apimgt.handler.server.feature</module>-->
     </modules>
 
 </project>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
index 845938c469..f315096d69 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
@@ -43,34 +43,6 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-            <!--<artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.registry</groupId>-->
-            <!--<artifactId>org.wso2.carbon.registry.indexing</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.analytics-common</groupId>-->
-            <!--<artifactId>org.wso2.carbon.event.receiver.stub</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.analytics-common</groupId>-->
-            <!--<artifactId>org.wso2.carbon.event.stream.stub</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.analytics-common</groupId>-->
-            <!--<artifactId>org.wso2.carbon.event.publisher.stub</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.analytics-common</groupId>-->
-            <!--<artifactId>org.wso2.carbon.event.stream.persistence.stub</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.orbit.org.scannotation</groupId>-->
-            <!--<artifactId>scannotation</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -127,27 +99,6 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.data.publisher:${carbon.device.mgt.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.stub:${carbon.analytics.common.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.stub:${carbon.analytics.common.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.stub:${carbon.analytics.common.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.persistence.stub:${carbon.analytics.common.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.orbit.com.fasterxml.jackson.core:jackson-annotations:${jackson-annotations.version}-->
-                                <!--</bundleDef>-->
-                                <!--<bundleDef>-->
-                                    <!--org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}-->
-                                <!--</bundleDef>-->
                             </bundles>
                             <importBundles>
                                 <importBundleDef>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml
index 23c74aaedb..637f40f776 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml
@@ -20,7 +20,6 @@
             </filter>
         </inSequence>
         <outSequence>
-            <!--<class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>-->
             <send/>
         </outSequence>
     </resource>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml
index 7d26b7b857..ec61d66eec 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml
@@ -20,7 +20,6 @@
             </filter>
         </inSequence>
         <outSequence>
-            <!--<class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>-->
             <send/>
         </outSequence>
     </resource>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
index 0222243bf9..00d4a96a0b 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
@@ -87,8 +87,6 @@
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
-                                <!--<importFeatureDef>org.wso2.carbon.governance.metadata.server:${carbon.governance.version}-->
-                                <!--</importFeatureDef>-->
                             </importFeatures>
                         </configuration>
                     </execution>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
index 4472e7200f..f986e520a0 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
@@ -39,11 +39,6 @@
             <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
             <type>zip</type>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-            <!--<artifactId>org.wso2.carbon.device.mgt.ui.feature</artifactId>-->
-            <!--<type>zip</type>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
@@ -80,7 +75,6 @@
                             </adviceFile>
                             <includedFeatures>
                                 <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}</includedFeatureDef>
-                                <!--<includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.ui.feature:${carbon.device.mgt.version}</includedFeatureDef>-->
                             </includedFeatures>
                             <bundles>
                                 <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml
index 37bcec882b..528051da15 100644
--- a/features/device-mgt/pom.xml
+++ b/features/device-mgt/pom.xml
@@ -35,11 +35,9 @@
     <modules>
         <module>org.wso2.carbon.device.mgt.basics.feature</module>
         <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.feature</module>
         <module>org.wso2.carbon.device.mgt.extensions.feature</module>
-        <!--<module>org.wso2.carbon.device.mgt.analytics.feature</module>-->
     </modules>
 
 </project>
diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml b/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml
index 6d17103c21..de26779b16 100644
--- a/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml
+++ b/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml
@@ -73,14 +73,6 @@
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
-                <!--<exclusion>-->
-                    <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-                    <!--<artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<groupId>org.wso2.carbon.analytics</groupId>-->
-                    <!--<artifactId>org.wso2.carbon.analytics.api</artifactId>-->
-                <!--</exclusion>-->
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 22525c77c5..e902abd70c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,11 +54,6 @@
         <module>features/jwt-client</module>
 	    <module>features/device-mgt-extensions</module>
         <module>features/transport-mgt</module>
-
-        <!--<module>components/webapp-authenticator-framework</module>-->
-        <!--<module>features/webapp-authenticator-framework</module>-->
-        <!--<module>features/oauth-extensions</module>-->
-
     </modules>
 
     <dependencyManagement>
@@ -241,16 +236,6 @@
                 <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-			<!--<dependency>-->
-				<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-				<!--<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>-->
-				<!--<version>${carbon.device.mgt.version}</version>-->
-			<!--</dependency>-->
-			<!--<dependency>-->
-				<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-				<!--<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>-->
-				<!--<version>${carbon.device.mgt.version}</version>-->
-			<!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
@@ -282,11 +267,6 @@
                 <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-                <!--<artifactId>org.wso2.carbon.device.mgt.analytics.wsproxy</artifactId>-->
-                <!--<version>${carbon.device.mgt.version}</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
@@ -305,12 +285,6 @@
                 <type>zip</type>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-                <!--<artifactId>org.wso2.carbon.device.mgt.ui.feature</artifactId>-->
-                <!--<type>zip</type>-->
-                <!--<version>${carbon.device.mgt.version}</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
@@ -326,12 +300,6 @@
                 <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-
-            <!--<dependency>-->
-                <!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
-                <!--<artifactId>org.wso2.carbon.apimgt.handlers</artifactId>-->
-                <!--<version>${carbon.device.mgt.version}</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
@@ -479,7 +447,8 @@
                     </exclusion>
                     <exclusion>
                         <groupId>javax.servlet</groupId>
-                        <artifactId>javax.servlet-api</artifactId>                    </exclusion>
+                        <artifactId>javax.servlet-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -828,7 +797,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>4.4.9</version>
+                <version>${org.wso2.carbon.logging.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -1159,17 +1128,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <!--<dependency>-->
-                <!--<groupId>org.apache.cxf</groupId>-->
-                <!--<artifactId>cxf-rt-bindings-http</artifactId>-->
-                <!--<version>${cxf.bindings.version}</version>-->
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.codehaus.jra</groupId>-->
-                        <!--<artifactId>jra</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-rt-rs-extension-providers</artifactId>
@@ -1353,21 +1311,11 @@
                 <artifactId>gson</artifactId>
                 <version>${google.gson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.com.squareup.okhttp</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>${okhttp.wso2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp</artifactId>
                 <version>${squareup.okhttp3.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.com.squareup.okio</groupId>
-                <artifactId>okio</artifactId>
-                <version>${okio.wso2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.squareup.okio</groupId>
                 <artifactId>okio</artifactId>
@@ -2085,6 +2033,7 @@
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
         <carbon.feature.plugin.version>3.1.3</carbon.feature.plugin.version>
+        <org.wso2.carbon.logging.version>4.4.9</org.wso2.carbon.logging.version>
 
         <!-- Axis2 -->
         <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
@@ -2193,8 +2142,6 @@
         <json.smart.version>1.3</json.smart.version>
         <google.gson.version>2.3.1</google.gson.version>
         <squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
-        <okhttp.wso2.version>4.2.0.wso2v1</okhttp.wso2.version>
-        <okio.wso2.version>2.4.0.wso2v1</okio.wso2.version>
         <okio.version>1.13.0</okio.version>
         <github.openfeign.version>9.3.1</github.openfeign.version>
         <jsr311.version>1.1.1</jsr311.version>