diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml
deleted file mode 100644
index 0991207a548..00000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/cdm-config.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.
-  -->
-
-<DeviceMgtConfiguration>
-    <ManagementRepository>
-        <DataSourceConfiguration>
-            <JndiLookupDefinition>
-                <Name>jdbc/DM_DS</Name>
-            </JndiLookupDefinition>
-        </DataSourceConfiguration>
-        <EmailClientConfiguration>
-            <minimumThread>8</minimumThread>
-            <maximumThread>100</maximumThread>
-            <keepAliveTime>20</keepAliveTime>
-            <ThreadQueueCapacity>1000</ThreadQueueCapacity>
-        </EmailClientConfiguration>
-    </ManagementRepository>
-</DeviceMgtConfiguration>
-
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml
deleted file mode 100644
index e182e58bb91..00000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/license-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.
-  -->
-
-<LicenseConfig>
-    <Licenses>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>android</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[Test License]]></Text>
-        </License>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>ios</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[IOS License]]></Text>
-        </License>
-        <License>
-            <Provider>wso2</Provider>
-            <Name>windows</Name>
-            <Version>1.0.0</Version>
-            <Language>1.0.0</Language>
-            <ValidFrom>01-01-2014</ValidFrom>
-            <ValidTo>31-12-2035</ValidTo>
-            <Text><![CDATA[Windows License]]></Text>
-        </License>
-    </Licenses>
-</LicenseConfig>
\ No newline at end of file
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml
deleted file mode 100644
index 563b4a58c07..00000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/notification-messages.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.
--->
-
-<Notifications>
-    <EnrolmentNotifications>
-            <Header>Dear {title} {user-name},</Header>
-            <Body>You have been registered to the WSO2 MDM. Below is the link to enroll.</Body>
-            <Url>{downloadUrl}</Url>
-            <Footer>
-Best Regards,
-WSO2 Carbon Team
-http://www.wso2.com
-            </Footer>
-            <Subject>Enrol your device with WSO2 MDM</Subject>
-    </EnrolmentNotifications>
-</Notifications>
\ No newline at end of file
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml
deleted file mode 100644
index 3221092ae97..00000000000
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, 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.
--->
-<APIPublisherConfig>
-        <APIs>
-            <API>
-               <Name>appmanager</Name>
-               <Owner>admin</Owner>
-               <Context>enrollment</Context>
-               <Version>1.0.0</Version>
-               <Endpoint>http://localhost:9763/</Endpoint>
-               <Transports>http,https</Transports>
-            </API>
-        </APIs>
-</APIPublisherConfig>
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
index 36ac4e31efe..a7f67523c62 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
@@ -1,7 +1,2 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/notification-messages.xml,target:${installFolder}/../../conf/notification-messages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/user-api-publisher-config.xml,target:${installFolder}/../../conf/etc/user-api-publisher-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b60609f3675..a325bcaede5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1150,9 +1150,11 @@
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.commons.version>4.3.6</carbon.commons.version>
 
-        <!-- API Management -->
+	<!-- Carbon Commons -->
+        <carbon.commons.version>4.4.0</carbon.commons.version>
+
+        <!-- Carbon API Management -->
         <carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
 
         <!--CXF properties-->