diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json
deleted file mode 100644
index 5617ac60d6..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/conf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "x", "title" : "ACCELEROMETER X", "maxLength" : "30", "gadget-name" : "Accelerometer X", "chart-name" : "number-chart"}}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css
deleted file mode 100644
index 5dde0413a8..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/css/number-chart.css
+++ /dev/null
@@ -1,35 +0,0 @@
-#canvas {
-    height: 100%;
-    width: 100%;
-}
-
-p {
-    margin: 0;
-    display: block;
-    text-align: center;
-    font-weight: bold;
-}
-
-.titlecanvasContent {
-   	color:steelblue;
-   	font-size:18px;
-    font-weight: normal;
-    padding: 10px 0;
-}
-
-.valcanvasContent {
-   	color:#438CAD;
-   	font-size:50px;
-    font-weight: normal;
-}
-
-
-.diffcanvasContent {
-   	color:#438CAD;
-   	font-size:14px;
-}
-
-.diffPercentagecanvasContent {
-   	color:#ff944d;
-   	font-size:14px;
-}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json
deleted file mode 100644
index 90a89cbffe..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_x_gadget/Accelerometer_X/gadget.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "Accelerometer_X",
-    "title": "Accelerometer X",
-    "type": "gadget",
-    "thumbnail": "gadget/Accelerometer_X/thumbnail.png",
-    "data": {
-        "url": "gadget/Accelerometer_X/gadget.xml"
-    }
-}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json
deleted file mode 100644
index f20d0c48ad..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/conf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "y", "title" : "ACCELEROMETER Y", "maxLength" : "30", "gadget-name" : "ACCELEROMETER Y", "chart-name" : "number-chart"}}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css
deleted file mode 100644
index 5dde0413a8..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/css/number-chart.css
+++ /dev/null
@@ -1,35 +0,0 @@
-#canvas {
-    height: 100%;
-    width: 100%;
-}
-
-p {
-    margin: 0;
-    display: block;
-    text-align: center;
-    font-weight: bold;
-}
-
-.titlecanvasContent {
-   	color:steelblue;
-   	font-size:18px;
-    font-weight: normal;
-    padding: 10px 0;
-}
-
-.valcanvasContent {
-   	color:#438CAD;
-   	font-size:50px;
-    font-weight: normal;
-}
-
-
-.diffcanvasContent {
-   	color:#438CAD;
-   	font-size:14px;
-}
-
-.diffPercentagecanvasContent {
-   	color:#ff944d;
-   	font-size:14px;
-}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json
deleted file mode 100644
index 16db7931b7..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_y_gadget/ACCELEROMETER_Y/gadget.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "ACCELEROMETER_Y",
-    "title": "ACCELEROMETER Y",
-    "type": "gadget",
-    "thumbnail": "gadget/ACCELEROMETER_Y/thumbnail.png",
-    "data": {
-        "url": "gadget/ACCELEROMETER_Y/gadget.xml"
-    }
-}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json
deleted file mode 100644
index 1940ff1dde..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/conf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"provider-conf" : {"streamName" : "org.wso2.iot.android.accelerometer:1.0.0", "provider-name" : "realtime"}, "chart-conf" : {"x" : "z", "title" : "ACCELEROMETER Z", "maxLength" : "30", "gadget-name" : "ACCELEROMETER Z", "chart-name" : "number-chart"}}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css
deleted file mode 100644
index 5dde0413a8..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/css/number-chart.css
+++ /dev/null
@@ -1,35 +0,0 @@
-#canvas {
-    height: 100%;
-    width: 100%;
-}
-
-p {
-    margin: 0;
-    display: block;
-    text-align: center;
-    font-weight: bold;
-}
-
-.titlecanvasContent {
-   	color:steelblue;
-   	font-size:18px;
-    font-weight: normal;
-    padding: 10px 0;
-}
-
-.valcanvasContent {
-   	color:#438CAD;
-   	font-size:50px;
-    font-weight: normal;
-}
-
-
-.diffcanvasContent {
-   	color:#438CAD;
-   	font-size:14px;
-}
-
-.diffPercentagecanvasContent {
-   	color:#ff944d;
-   	font-size:14px;
-}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json
deleted file mode 100644
index 4236c240ac..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_accelerometer_z_gadget/ACCELEROMETER_Z/gadget.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "ACCELEROMETER_Z",
-    "title": "ACCELEROMETER Z",
-    "type": "gadget",
-    "thumbnail": "gadget/ACCELEROMETER_Z/thumbnail.png",
-    "data": {
-        "url": "gadget/ACCELEROMETER_Z/gadget.xml"
-    }
-}