diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index e9ddee339..fa5595d07 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -15,7 +15,7 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{unit "cdmf.unit.device.type.android_sense.leaflet"}}
+{{!unit "cdmf.unit.device.type.android_sense.leaflet"}}
 {{#zone "topCss"}}
     <style>
         .thumbnail.icon:before {
@@ -101,7 +101,4 @@
         <div id="chartWrapper">
         </div>
     </div>
-{{/zone}}
-{{#zone "bottomJs"}}
-    {{js "js/load-map.js"}}
-{{/zone}}
+{{/zone}}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/js/load-map.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/js/load-map.js
deleted file mode 100644
index 4a7361e27..000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/js/load-map.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-
-var map;
-
-function loadLeafletMap() {
-    var deviceLocationID = "#device-location",
-        locations = $(deviceLocationID).data("locations"),
-        container = "device-location",
-        zoomLevel = 13,
-        tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
-        attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
-    if (locations) {
-
-        var locationSets = locations.locations;
-        map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel);
-        L.tileLayer(tileSet, {attribution: attribution}).addTo(map);
-
-        var initTime = locations.times[0].time, lastTime = locations.times[locationSets.length - 1].time;
-        var totalTime = lastTime - initTime;
-        for (var i = 0; i < locationSets.length; i++) {
-            var opacVal = (locations.times[i].time - initTime) / totalTime;
-            var m = L.marker(locationSets[i], {"opacity": opacVal}).addTo(map).bindPopup(new Date(locations.times[i].time).toISOString());
-            m.on('mouseover', function (e) {
-                this.openPopup();
-            });
-            m.on('mouseout', function (e) {
-                this.closePopup();
-            });
-        }
-
-        $("#map-error").hide();
-        $("#device-location").show();
-    } else {
-        $("#device-location").hide();
-        $("#map-error").show();
-    }
-}
-
-$(document).ready(function () {
-    $(".location_tab").on("click", function () {
-        loadLeafletMap();
-    });
-});
\ No newline at end of file