diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
deleted file mode 100644
index 58a1b2718..000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
+++ /dev/null
@@ -1,1312 +0,0 @@
-{
-  "accessTokenUrl": "",
-  "apiKey": "",
-  "apiSecret": "",
-  "banner": {
-    "globalBannerExists": false,
-    "customBannerExists": false
-  },
-  "description": "",
-  "hideAllMenuItems": false,
-  "id": "android-iot",
-  "identityServerUrl": "",
-  "isEditorEnable": false,
-  "isUserCustom": false,
-  "isanon": false,
-  "landing": "sensors",
-  "menu": [
-    {
-      "id": "sensors",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Sensors"
-    },
-    {
-      "id": "real-time",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Realtime Data"
-    },
-    {
-      "id": "fitness",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Fitness"
-    },
-    {
-      "id": "battery",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Battery"
-    },
-    {
-      "id": "location",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Location"
-    },
-    {
-      "id": "communication",
-      "isanon": false,
-      "ishidden": false,
-      "subordinates": [],
-      "title": "Communication"
-    }
-  ],
-  "pages": [
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [],
-          "b": [
-            {
-              "id": "ANDROID_MAGNETIC_GADGET-0",
-              "content": {
-                "id": "ANDROID_MAGNETIC_GADGET",
-                "title": "ANDROID_MAGNETIC_GADGET",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/ANDROID_MAGNETIC_GADGET/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/ANDROID_MAGNETIC_GADGET/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "MAGNETIC FIELD"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "MAGNETIC FIELD"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "8e564cb7a1c6519179e2111cc05a79ca": [
-            {
-              "id": "ANDROID_ACCELEROMETER_GADGET-0",
-              "content": {
-                "id": "ANDROID_ACCELEROMETER_GADGET",
-                "title": "ANDROID_ACCELEROMETER_GADGET",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/ANDROID_ACCELEROMETER_GADGET/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/ANDROID_ACCELEROMETER_GADGET/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "ACCELEROMETER"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "ACCELEROMETER"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "fdfada688ff9e7b3271eece314618532": [
-            {
-              "id": "GRAVITY-0",
-              "content": {
-                "id": "GRAVITY",
-                "title": "GRAVITY",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/GRAVITY/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/GRAVITY/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "GRAVITY"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "GRAVITY"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "46193833e958e9f7e879263f372eb508": [
-            {
-              "id": "PRESSURE-0",
-              "content": {
-                "id": "PRESSURE",
-                "title": "PRESSURE",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/PRESSURE/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/PRESSURE/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "PRESSURE"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "PRESSURE"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "765379a7012b8819ea13524e5b312509": [
-            {
-              "id": "ANDROID_ROTATION_GADGET-0",
-              "content": {
-                "id": "ANDROID_ROTATION_GADGET",
-                "title": "ANDROID_ROTATION_GADGET",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/ANDROID_ROTATION_GADGET/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/ANDROID_ROTATION_GADGET/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "ROTATIONAL VECTOR"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "ROTATIONAL VECTOR"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ],
-          "47ceaee8a089ea8ef75c91e5b83a1a36": [
-            {
-              "id": "ANDROID_GYROSCOPE_GADGET-0",
-              "content": {
-                "id": "ANDROID_GYROSCOPE_GADGET",
-                "title": "ANDROID_GYROSCOPE_GADGET",
-                "type": "gadget",
-                "thumbnail": "fs://gadget/ANDROID_GYROSCOPE_GADGET/thumbnail.png",
-                "data": {
-                  "url": "fs://gadget/ANDROID_GYROSCOPE_GADGET/gadget.xml"
-                },
-                "styles": {
-                  "no_heading": false,
-                  "hide_gadget": false,
-                  "titlePosition": "center",
-                  "title": "GYROSCOPE"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "locale_titles": {
-                  "en-US": "GYROSCOPE"
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                }
-              }
-            }
-          ]
-        }
-      },
-      "id": "sensors",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "id": "b",
-                "x": 6,
-                "y": 0,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "8e564cb7a1c6519179e2111cc05a79ca",
-                "x": 0,
-                "y": 0,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "fdfada688ff9e7b3271eece314618532",
-                "x": 0,
-                "y": 5,
-                "width": 6,
-                "height": 3,
-                "banner": false
-              },
-              {
-                "id": "46193833e958e9f7e879263f372eb508",
-                "x": 6,
-                "y": 5,
-                "width": 6,
-                "height": 3,
-                "banner": false
-              },
-              {
-                "id": "765379a7012b8819ea13524e5b312509",
-                "x": 0,
-                "y": 8,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "47ceaee8a089ea8ef75c91e5b83a1a36",
-                "x": 6,
-                "y": 8,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Sensors"
-    },
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Realtime_Audio/gadget.xml"
-                },
-                "id": "Android_Realtime_Audio",
-                "locale_titles": {
-                  "en-US": "Audio"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Audio",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Realtime_Audio/thumbnail.png",
-                "title": "Android Realtime Audio",
-                "type": "gadget"
-              },
-              "id": "Android_Realtime_Audio-0"
-            }
-          ],
-          "b": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Realtime_Screen/gadget.xml"
-                },
-                "id": "Android_Realtime_Screen",
-                "locale_titles": {
-                  "en-US": "Screen"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Screen",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Realtime_Screen/thumbnail.png",
-                "title": "Android Realtime Screen",
-                "type": "gadget"
-              },
-              "id": "Android_Realtime_Screen-0"
-            }
-          ],
-          "c": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Realtime_Battery/gadget.xml"
-                },
-                "id": "Android_Realtime_Battery",
-                "locale_titles": {
-                  "en-US": "Battery"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Battery",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Realtime_Battery/thumbnail.png",
-                "title": "Android Realtime Battery",
-                "type": "gadget"
-              },
-              "id": "Android_Realtime_Battery-0"
-            }
-          ],
-          "d": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Realtime_Call/gadget.xml"
-                },
-                "id": "Android_Realtime_Call",
-                "locale_titles": {
-                  "en-US": "Call"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Call",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Realtime_Call/thumbnail.png",
-                "title": "Android Realtime Call",
-                "type": "gadget"
-              },
-              "id": "Android_Realtime_Call-0"
-            }
-          ],
-          "e": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Realtime_SMS/gadget.xml"
-                },
-                "id": "Android_Realtime_SMS",
-                "locale_titles": {
-                  "en-US": "SMS"
-                },
-                "options": {
-                  "windowSize": {
-                    "type": "STRING",
-                    "title": "Window Size",
-                    "value": "10",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "SMS",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Realtime_SMS/thumbnail.png",
-                "title": "Android Realtime SMS",
-                "type": "gadget"
-              },
-              "id": "Android_Realtime_SMS-0"
-            }
-          ]
-        }
-      },
-      "id": "real-time",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "id": "a",
-                "x": 3,
-                "y": 10,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "b",
-                "x": 6,
-                "y": 0,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "c",
-                "x": 0,
-                "y": 0,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "d",
-                "x": 0,
-                "y": 5,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              },
-              {
-                "id": "e",
-                "x": 6,
-                "y": 5,
-                "width": 6,
-                "height": 5,
-                "banner": false
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Realtime Data"
-    },
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Activity_Chart/gadget.xml"
-                },
-                "id": "Android_Activity_Chart",
-                "locale_titles": {
-                  "en-US": "Physical Activities"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Physical Activities",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Activity_Chart/thumbnail.png",
-                "title": "Android Activity Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Activity_Chart-0",
-              "fullViewPoped": false,
-              "viewOption": "default"
-            }
-          ],
-          "b": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Screen_On_Chart/gadget.xml"
-                },
-                "id": "Android_Screen_On_Chart",
-                "locale_titles": {
-                  "en-US": "Eye Strain"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Eye Strain",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Screen_On_Chart/thumbnail.png",
-                "title": "Android_Screen_On_Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Screen_On_Chart-0"
-            }
-          ],
-          "c": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Headset_Usage_Chart/gadget.xml"
-                },
-                "id": "Android_Headset_Usage_Chart",
-                "locale_titles": {
-                  "en-US": "Headphone Usage"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Headphone Usage",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Headset_Usage_Chart/thumbnail.png",
-                "title": "Android_Headset_Usage_Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Headset_Usage_Chart-0"
-            }
-          ],
-          "d": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Active_Stack_Chart/gadget.xml"
-                },
-                "id": "Android_Active_Stack_Chart",
-                "locale_titles": {
-                  "en-US": "Active Time"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "type": "STRING",
-                    "title": "Refresh Interval",
-                    "value": "1000000",
-                    "options": [],
-                    "required": false
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Active Time",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Active_Stack_Chart/thumbnail.png",
-                "title": "Android Active Stack Chart",
-                "type": "gadget"
-              },
-              "fullViewPoped": false,
-              "id": "Android_Active_Stack_Chart-0",
-              "viewOption": "default"
-            }
-          ]
-        }
-      },
-      "id": "fitness",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "id": "a",
-                "x": 0,
-                "y": 0,
-                "width": 4,
-                "height": 6,
-                "banner": false
-              },
-              {
-                "id": "b",
-                "x": 4,
-                "y": 0,
-                "width": 4,
-                "height": 6,
-                "banner": false
-              },
-              {
-                "id": "c",
-                "x": 8,
-                "y": 0,
-                "width": 4,
-                "height": 6,
-                "banner": false
-              },
-              {
-                "id": "d",
-                "x": 0,
-                "y": 6,
-                "width": 12,
-                "height": 6,
-                "banner": false
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Fitness"
-    },
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Battery_History_Chart/gadget.xml"
-                },
-                "id": "Android_Battery_History_Chart",
-                "locale_titles": {
-                  "en-US": "History"
-                },
-                "options": {
-                  "windowSize": {
-                    "options": [],
-                    "required": false,
-                    "title": "Window Size",
-                    "type": "STRING",
-                    "value": "10"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "History",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Battery_History_Chart/thumbnail.png",
-                "title": "Android Battery Hisory Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Battery_History_Chart-0"
-            }
-          ],
-          "e": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Battery_Percentage_Chart/gadget.xml"
-                },
-                "id": "Android_Battery_Percentage_Chart",
-                "locale_titles": {
-                  "en-US": "Android Battery Percentage Chart"
-                },
-                "options": {
-                  "windowSize": {
-                    "options": [],
-                    "required": false,
-                    "title": "Window Size",
-                    "type": "STRING",
-                    "value": "10"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": true,
-                  "title": "Android Battery Percentage Chart",
-                  "titlePosition": "left"
-                },
-                "thumbnail": "fs://gadget/Android_Battery_Percentage_Chart/thumbnail.png",
-                "title": "Android Battery Percentage Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Battery_Percentage_Chart-0"
-            }
-          ]
-        }
-      },
-      "id": "battery",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "banner": false,
-                "height": 6,
-                "id": "a",
-                "width": 12,
-                "x": 0,
-                "y": 0
-              },
-              {
-                "banner": false,
-                "height": 4,
-                "id": "d",
-                "width": 4,
-                "x": 0,
-                "y": 6
-              },
-              {
-                "banner": false,
-                "height": 4,
-                "id": "e",
-                "width": 4,
-                "x": 4,
-                "y": 6
-              },
-              {
-                "banner": false,
-                "height": 4,
-                "id": "f",
-                "width": 4,
-                "x": 8,
-                "y": 6
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Battery"
-    },
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Location_Map/gadget.xml"
-                },
-                "id": "Android_Location_Map",
-                "locale_titles": {
-                  "en-US": "Location"
-                },
-                "options": {
-                  "windowSize": {
-                    "options": [],
-                    "required": false,
-                    "title": "Window Size",
-                    "type": "STRING",
-                    "value": "10"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Location",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Location_Map/thumbnail.png",
-                "title": "Android Location Map",
-                "type": "gadget"
-              },
-              "id": "Android_Location_Map-0"
-            }
-          ]
-        }
-      },
-      "id": "location",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "banner": false,
-                "height": 11,
-                "id": "a",
-                "width": 12,
-                "x": 0,
-                "y": 0
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Location"
-    },
-    {
-      "content": {
-        "anon": {},
-        "default": {
-          "a": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Call_Time_Chart/gadget.xml"
-                },
-                "id": "Android_Call_Time_Chart",
-                "locale_titles": {
-                  "en-US": "Call"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Call",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Call_Time_Chart/thumbnail.png",
-                "title": "Android Call Time Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Call_Time_Chart-0"
-            }
-          ],
-          "b": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_SMS_Chart/gadget.xml"
-                },
-                "id": "Android_SMS_Chart",
-                "locale_titles": {
-                  "en-US": "SMS"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "SMS",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_SMS_Chart/thumbnail.png",
-                "title": "Android SMS Chart",
-                "type": "gadget"
-              },
-              "id": "Android_SMS_Chart-0"
-            }
-          ],
-          "bcebe3402908ae61d1e7025e1aff4d24": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Frequent_Contacts_List/gadget.xml"
-                },
-                "id": "Android_Frequent_Contacts_List",
-                "locale_titles": {
-                  "en-US": "Frequent Contacts"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Frequent Contacts",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Frequent_Contacts_List/thumbnail.png",
-                "title": "Android Frequent Contacts List",
-                "type": "gadget"
-              },
-              "id": "Android_Frequent_Contacts_List-0"
-            }
-          ],
-          "c": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Data_Usage_Chart/gadget.xml"
-                },
-                "id": "Android_Data_Usage_Chart",
-                "locale_titles": {
-                  "en-US": "Data Usage"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Data Usage",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Data_Usage_Chart/thumbnail.png",
-                "title": "Android Data Usage Chart",
-                "type": "gadget"
-              },
-              "id": "Android_Data_Usage_Chart-0"
-            }
-          ],
-          "d": [
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Frequent_Contacts_1/gadget.xml"
-                },
-                "id": "Android_Frequent_Contacts_1",
-                "locale_titles": {},
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "styles": {
-                  "borders": true,
-                  "title": "Android_Frequent_Contacts_1"
-                },
-                "thumbnail": "fs://gadget/Android_Frequent_Contacts_1/thumbnail.png",
-                "title": "Android_Frequent_Contacts_1",
-                "type": "gadget"
-              },
-              "id": "Android_Frequent_Contacts_1-0"
-            },
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Overall_Frequent_Contacts/gadget.xml"
-                },
-                "id": "Android_Overall_Frequent_Contacts",
-                "locale_titles": {
-                  "en-US": "Frequent Contacts"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Frequent Contacts",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Overall_Frequent_Contacts/thumbnail.png",
-                "title": "Android Overall Frequent Contacts",
-                "type": "gadget"
-              },
-              "id": "Android_Overall_Frequent_Contacts-0"
-            },
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Overall_Frequent_Contacts/gadget.xml"
-                },
-                "id": "Android_Overall_Frequent_Contacts",
-                "locale_titles": {
-                  "en-US": "Frequent Contacts"
-                },
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "settings": {
-                  "priority": "5",
-                  "timeoutInterval": "60000"
-                },
-                "styles": {
-                  "hide_gadget": false,
-                  "no_heading": false,
-                  "title": "Frequent Contacts",
-                  "titlePosition": "center"
-                },
-                "thumbnail": "fs://gadget/Android_Overall_Frequent_Contacts/thumbnail.png",
-                "title": "Android Overall Frequent Contacts",
-                "type": "gadget"
-              },
-              "id": "Android_Overall_Frequent_Contacts-1"
-            },
-            {
-              "content": {
-                "data": {
-                  "url": "fs://gadget/Android_Overall_Frequent_Contacts/gadget.xml"
-                },
-                "id": "Android_Overall_Frequent_Contacts",
-                "locale_titles": {},
-                "options": {
-                  "refreshInterval": {
-                    "options": [],
-                    "required": false,
-                    "title": "Refresh Interval",
-                    "type": "STRING",
-                    "value": "1000000"
-                  }
-                },
-                "styles": {
-                  "borders": true,
-                  "title": "Android Overall Frequent Contacts"
-                },
-                "thumbnail": "fs://gadget/Android_Overall_Frequent_Contacts/thumbnail.png",
-                "title": "Android Overall Frequent Contacts",
-                "type": "gadget"
-              },
-              "id": "Android_Overall_Frequent_Contacts-0"
-            }
-          ],
-          "f": []
-        }
-      },
-      "id": "communication",
-      "isanon": false,
-      "layout": {
-        "content": {
-          "loggedIn": {
-            "blocks": [
-              {
-                "banner": false,
-                "height": 6,
-                "id": "a",
-                "width": 4,
-                "x": 0,
-                "y": 0
-              },
-              {
-                "banner": false,
-                "height": 6,
-                "id": "b",
-                "width": 4,
-                "x": 4,
-                "y": 0
-              },
-              {
-                "banner": false,
-                "height": 6,
-                "id": "c",
-                "width": 4,
-                "x": 8,
-                "y": 0
-              },
-              {
-                "banner": false,
-                "height": 4,
-                "id": "f",
-                "width": 6,
-                "x": 6,
-                "y": 6
-              },
-              {
-                "banner": false,
-                "height": 4,
-                "id": "bcebe3402908ae61d1e7025e1aff4d24",
-                "width": 6,
-                "x": 0,
-                "y": 6
-              }
-            ]
-          }
-        },
-        "fluidLayout": false
-      },
-      "title": "Communication"
-    }
-  ],
-  "permissions": {
-    "editors": [
-      "Internal/android-iot-editor"
-    ],
-    "owners": [
-      "Internal/android-iot-owner"
-    ],
-    "viewers": [
-      "Internal/android-iot-viewer"
-    ]
-  },
-  "shareDashboard": false,
-  "theme": "Default Theme",
-  "title": "Android IOT",
-  "defaultPriority": "5"
-}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/artifact.xml
deleted file mode 100644
index 48de047da..000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, 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.
--->
-
-<artifact name="android_sense_dashboard" version="1.0.0" type="dashboards/dashboard" serverRole="DataAnalyticsServer">
-    <file>android-iot.json</file>
-</artifact>
\ 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_sms_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/artifact.xml
deleted file mode 100644
index a5c638602..000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, 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.
-  -->
-
-<artifact name= "android_sms_chart_gadget" version="1.0.0" type="dashboards/gadget" serverRole="DataAnalyticsServer">
-	<file>Android_SMS_Chart</file>
-</artifact>
-