diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/AndroidDAOFactory.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/AndroidDAOFactory.java
index f1cb9f4bd..dd116e519 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/AndroidDAOFactory.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/AndroidDAOFactory.java
@@ -21,7 +21,6 @@ package org.wso2.carbon.device.mgt.mobile.impl.android.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.mobile.config.datasource.MobileDataSourceConfig;
 import org.wso2.carbon.device.mgt.mobile.dao.*;
 import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidDeviceDAOImpl;
 import org.wso2.carbon.device.mgt.mobile.impl.android.dao.impl.AndroidFeatureDAOImpl;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
index 0bf2bd338..104856fff 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java
@@ -28,7 +28,6 @@ public class AndroidUtils {
 	public static String getDeviceProperty(Map<String, String> deviceProperties, String property) {
 
 		String deviceProperty = deviceProperties.get(property);
-
 		if (deviceProperty == null) {
 			return "";
 		}
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
index c9ea6f1b1..c6ae33335 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/h2_android.sql
@@ -5,7 +5,7 @@
 CREATE  TABLE IF NOT EXISTS `AD_DEVICE` (
   `ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
   `GCM_TOKEN` VARCHAR(45) NULL DEFAULT NULL ,
-  `DEVICE_INFO` VARCHAR(500) NULL DEFAULT NULL ,
+  `DEVICE_INFO` VARCHAR(8000) NULL DEFAULT NULL ,
   `IMEI` VARCHAR(45) NULL DEFAULT NULL ,
   `IMSI` VARCHAR(45) NULL DEFAULT NULL ,
   `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL ,
diff --git a/pom.xml b/pom.xml
index 7a084d71c..0e07aa8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,9 +476,6 @@
         <!-- Mobile Device Management -->
         <carbon.mobile.device.mgt.version>1.9.2-SNAPSHOT</carbon.mobile.device.mgt.version>
 
-        <!-- API Management -->
-        <carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
-
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>
         <bouncycastle.version>1.49</bouncycastle.version>
@@ -611,7 +608,6 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
         </pluginRepository>
-
         <pluginRepository>
             <id>wso2.snapshots</id>
             <name>Apache Snapshot Repository</name>
@@ -653,7 +649,6 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
         </repository>
-
         <repository>
             <id>wso2.releases</id>
             <name>WSO2 internal Repository</name>
@@ -664,7 +659,6 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
         </repository>
-
         <repository>
             <id>wso2.snapshots</id>
             <name>WSO2 Snapshot Repository</name>
@@ -677,6 +671,5 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-    </repositories>
-
+	</repositories>
 </project>