diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/postgresql.sql~ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/postgresql.sql~
deleted file mode 100644
index 8c3f0591b..000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/android/postgresql.sql~
+++ /dev/null
@@ -1,30 +0,0 @@
--- -----------------------------------------------------
--- Table AD_DEVICE
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_DEVICE (
-  DEVICE_ID VARCHAR(45) NOT NULL ,
-  DEVICE_INFO VARCHAR(500) NULL DEFAULT NULL,
-  GCM_TOKEN VARCHAR(45) NULL DEFAULT NULL,
-  IMEI VARCHAR(45) NULL DEFAULT NULL,
-  IMSI VARCHAR(45) NULL DEFAULT NULL,
-  OS_VERSION VARCHAR(45) NULL DEFAULT NULL,
-  DEVICE_MODEL VARCHAR(45) NULL DEFAULT NULL,
-  VENDOR VARCHAR(45) NULL DEFAULT NULL,
-  LATITUDE VARCHAR(45) NULL DEFAULT NULL,
-  LONGITUDE VARCHAR(45) NULL DEFAULT NULL,
-  SERIAL VARCHAR(45) NULL DEFAULT NULL,
-  MAC_ADDRESS VARCHAR(45) NULL DEFAULT NULL,
-  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (DEVICE_ID)
- );
-
--- -----------------------------------------------------
--- Table AD_FEATURE
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_FEATURE (
-  ID INT NOT NULL AUTO_INCREMENT,
-  CODE VARCHAR(45) NOT NULL,
-  NAME VARCHAR(100) NULL,
-  DESCRIPTION VARCHAR(200) NULL,
-  PRIMARY KEY (ID)
-);
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql~ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql~
deleted file mode 100644
index 4fcb2873b..000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/ios/postgresql.sql~
+++ /dev/null
@@ -1,38 +0,0 @@
--- -----------------------------------------------------
--- Table IOS_FEATURE
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS IOS_FEATURE (
-  ID SERIAL NOT NULL,
-  CODE VARCHAR(45) NOT NULL,
-  NAME VARCHAR(100) NULL,
-  DESCRIPTION VARCHAR(200) NULL,
-  PRIMARY KEY (ID) 
-);
-
--- -----------------------------------------------------
--- Table IOS_DEVICE
--- -----------------------------------------------------
-<<<<<<< HEAD
-CREATE TABLE IF NOT EXISTS IOS_DEVICE (
-  DEVICE_ID VARCHAR(45) NOT NULL,
-=======
-CREATE  TABLE IF NOT EXISTS IOS_DEVICE (
-  MOBILE_DEVICE_ID VARCHAR(45) NOT NULL,
->>>>>>> bc22647a04f3297da94eb0e767d722d3b738144c
-  APNS_PUSH_TOKEN VARCHAR(100) NULL DEFAULT NULL,
-  MAGIC_TOKEN VARCHAR(100) NULL DEFAULT NULL,
-  MDM_TOKEN VARCHAR(100) NULL DEFAULT NULL,
-  UNLOCK_TOKEN VARCHAR(2000) NULL DEFAULT NULL,
-  CHALLENGE_TOKEN VARCHAR(45) NULL DEFAULT NULL,
-  DEVICE_INFO VARCHAR(8000) NULL DEFAULT NULL,
-  SERIAL VARCHAR(45) NULL DEFAULT NULL,
-  PRODUCT VARCHAR(45) NULL DEFAULT NULL,
-  IMEI VARCHAR(45) NULL DEFAULT NULL,
-  VERSION VARCHAR(45) NULL DEFAULT NULL,
-  MAC_ADDRESS VARCHAR(45) NULL DEFAULT NULL,
-  DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
-  ICCID VARCHAR(45) NULL DEFAULT NULL,
-  LATITUDE VARCHAR(45) NULL DEFAULT NULL,
-  LONGITUDE VARCHAR(45) NULL DEFAULT NULL,
-  PRIMARY KEY (MOBILE_DEVICE_ID)
- );
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql~ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql~
deleted file mode 100644
index a67e3b7e1..000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql~
+++ /dev/null
@@ -1,38 +0,0 @@
--- -----------------------------------------------------
--- Table `WIN_DEVICE`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `WIN_DEVICE` (
-  `DEVICE_ID` VARCHAR(45) NOT NULL,
-  `PUSH_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
-  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
-  `IMSI` VARCHAR(45) NULL DEFAULT NULL,
-  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
-  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL,
-  `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
-  `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
-  `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
-  `CHALLENGE` VARCHAR(45) NULL DEFAULT NULL,
-  `TOKEN` VARCHAR(50) NULL DEFAULT NULL,
-  `UNLOCK_TOKEN` VARCHAR(2000) NULL DEFAULT NULL,
-  `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
-  PRIMARY KEY (`DEVICE_ID`))
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
--- Table `WIN_FEATURE`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `WIN_FEATURE` (
-<<<<<<< HEAD
-  `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
-=======
-  `ID` INT NOT NULL AUTO_INCREMENT,
->>>>>>> b33be7d49d6c06bc8f1068bd6600b674bff470a8
-  `CODE` VARCHAR(45) NULL,
-  `NAME` VARCHAR(100) NULL,
-  `DESCRIPTION` VARCHAR(200) NULL,
-  PRIMARY KEY (`ID`))
-ENGINE = InnoDB;
-
-
-