diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java
index 1fb6fce607..e7e5dbe5bb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java
@@ -54,8 +54,8 @@ public class DeviceConfigurationManager {
             Document doc = DeviceManagerUtil.convertToDocument(deviceMgtConfig);
 
             /* Un-marshaling Device Management configuration */
-            JAXBContext rssContext = JAXBContext.newInstance(DeviceManagementConfig.class);
-            Unmarshaller unmarshaller = rssContext.createUnmarshaller();
+            JAXBContext cdmContext = JAXBContext.newInstance(DeviceManagementConfig.class);
+            Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
             this.currentDeviceConfig = (DeviceManagementConfig) unmarshaller.unmarshal(doc);
         } catch (Exception e) {
             throw new DeviceManagementException("Error occurred while initializing RSS config", e);
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index be12ea55a1..e1448fdd3e 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -304,11 +304,6 @@
             <outputDirectory>wso2cdm-${project.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/repository/database/WSO2EMM_DB.h2.db</source>
-            <outputDirectory>wso2cdm-${project.version}/repository/database</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
 
         <file>
             <source>