diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
deleted file mode 100644
index 2563f03ced..0000000000
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/templates/listing.hbs
+++ /dev/null
@@ -1,19 +0,0 @@
-<tr data-type="selectable" data-deviceid="{{deviceTypeId}}" data-devicetype="{{deviceTypeName}}">
-    <td class="remove-padding icon-only content-fill">
-        <div class="thumbnail icon">
-            <i class="square-element text fw fw-android"></i>
-        </div>
-    </td>
-    <td class="fade-edge remove-padding-top" data-search="{{deviceTypeLabel}}" data-display="{{deviceTypeLabel}}"
-        data-grid-label="Type">{{deviceTypeLabel}}</td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{appContext}}/device/{{deviceTypeName}}/enroll"
-           data-click-event="remove-form" class="btn col-md-12">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-check fw-stack-1x"></i>
-                            </span>
-            <span>Select</span>
-        </a>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/public/templates/listing.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/public/templates/listing.hbs
deleted file mode 100644
index 78eb9238ae..0000000000
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/public/templates/listing.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
-<tr data-type="selectable" data-deviceid="{{deviceType.id}}" data-devicetype="{{deviceType.name}}">
-    <td class="remove-padding icon-only content-fill">
-        <div class="thumbnail icon">
-            <!--<i class="square-element text fw fw-mobile"></i>-->
-            <img class="square-element text fw" src="{{../imageLocation}}{{deviceType.name}}.type-view/images/thumb.png" />
-        </div>
-    </td>
-    <td class="fade-edge remove-padding-top" data-search="{{deviceType.name}}" data-display="{{deviceType.name}}"
-        data-grid-label="Type">{{deviceType.name}}</td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
-                            </span>
-            <span class="hidden-xs hidden-on-grid-view">View</span>
-        </a>
-    </td>
-    <td class="text-right content-fill text-left-on-grid-view no-wrap">
-        <a href="{{../appContext}}/device/{{deviceType.name}}/enroll"
-           data-click-event="remove-form" class="btn padding-reduce-on-grid-view">
-                            <span class="fw-stack">
-                                <i class="fw fw-ring fw-stack-2x"></i>
-                                <i class="fw fw-view fw-stack-1x"></i>
-                            </span>
-            <span class="hidden-xs hidden-on-grid-view">Hide</span>
-        </a>
-    </td>
-</tr>
\ No newline at end of file
diff --git a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/type-view.hbs b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/type-view.hbs
index 882f2323d9..586361ba27 100644
--- a/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/type-view.hbs
+++ b/features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digitaldisplay.type-view/type-view.hbs
@@ -273,19 +273,5 @@
 {{#zone "bottomJs"}}
     {{js "/js/download.js"}}
     {{js "/js/jquery.validate.js"}}
-    <script type="text/javascript">
-
-        $(document).ready(function(){
-            toggleEnrollment();
-        });
-
-
-        function toggleEnrollment(){
-            $(".modalpopup-content").html($("#qr-code-modal").html());
-            //generateQRCode(".modalpopup-content .qr-code");
-            showPopup();
-        }
-
-    </script>
 {{/zone}}