diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 836505a2d..e05d2198d 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -113,135 +113,6 @@
               <div id="policy-list-container">
               </div>
             </div>
-            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                 id="policy_compliance_tab">
-                <div class="panel-heading visible-xs collapsed" id="policy_compliance">
-                    <h4 class="panel-title">
-                        <a role="button"
-                           data-toggle="collapse" data-parent="#tabs" href="#collapseTwo"
-                           aria-expanded="true" aria-controls="collapseTwo">
-                            <i class="fw fw-policy fw-2x"></i>
-                            Policy Compliance
-                            <i class="caret-updown fw fw-down"></i>
-                        </a>
-                    </h4>
-                </div>
-                <div class="panel-heading display-none-xs">
-                    Policy Compliance
-
-                    <span>
-                            <a href="javascript:void(0);" id="refresh-policy">
-                                <i class="fw fw-refresh"></i>
-                            </a>
-                        </span>
-                </div>
-                <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel"
-                     aria-labelledby="policy_compliance">
-                    <div class="panel-body ">
-                            <span class="visible-xs add-padding-2x text-right">
-                                <a href="javascript:void(0);" id="refresh-policy">
-                                    <i class="fw fw-refresh"></i>
-                                </a>
-                            </span>
-                        <div id="policy-spinner"
-                             class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
-                            <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
-                            Compliance...
-                        </div>
-                        <div id="policy-list-container">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                 id="device_location_tab">
-                <div class="panel-heading visible-xs collapsed" id="device_location">
-                    <h4 class="panel-title">
-                        <a role="button" data-toggle="collapse" data-parent="#tabs"
-                           href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
-                            <i class="fw fw-map-location fw-2x"></i>
-                            Device Location
-                            <i class="caret-updown fw fw-down"></i>
-                        </a>
-                    </h4>
-                </div>
-                <div class="panel-heading display-none-xs">
-                    Device Location
-                    <span>
-                        <a href="javascript:void(0);" id="refresh-location">
-                            <i class="fw fw-refresh"></i>
-                        </a>
-                    </span>
-                    <div id="map-spinner" class="wr-advance-operations-init hidden">
-                        <i class="fw fw-settings fw-spin fw-2x"></i> Fetching the latest location...
-                    </div>
-                </div>
-                <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
-                     aria-labelledby="device_location">
-                    <div class="panel-body">
-                        {{#if device.location}}
-                            {{unit "cdmf.unit.geo-dashboard" device=device noGeoFencing=false hideSearch=true}}
-                        {{else}}
-                            <div id="map-error" class="message message-warning">
-                                <h4 class="remove-margin">
-                                    <i class="icon fw fw-warning"></i>
-                                    Device location information is not available.
-                                </h4>
-                            </div>
-                            <p class="add-padding-5x"></p>
-                            <p class="add-padding-5x"></p>
-                            <p class="add-padding-5x"></p>
-                        {{/if}}
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                 id="installed_applications_tab">
-                <div class="panel-heading visible-xs collapsed" id="installed_applications">
-                    <h4 class="panel-title">
-                        <a role="button" data-toggle="collapse" data-parent="#tabs"
-                           href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
-                            <i class="fw fw-application fw-2x"></i>
-                            Installed Applications
-                            <i class="caret-updown fw fw-down"></i>
-                        </a>
-                    </h4>
-                </div>
-                <div class="panel-heading display-none-xs">
-                    Installed Applications
-
-                    <span>
-                            <a href="javascript:void(0);" id="refresh-apps">
-                                <i class="fw fw-refresh"></i>
-                            </a>
-                        </span>
-                </div>
-                <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel"
-                     aria-labelledby="installed_applications">
-                    <div class="panel-body">
-                            <span class="visible-xs add-padding-2x text-right">
-                                <a href="javascript:void(0);" id="refresh-apps">
-                                    <i class="fw fw-refresh"></i>
-                                </a>
-                            </span>
-                        <div id="apps-spinner" class="wr-advance-operations-init hidden">
-                            <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications
-                            List...
-                        </div>
-                        <div id="applications-list-container">
-                            <div class="message message-info">
-                                <h4>
-                                    <i class="icon fw fw-info"></i>
-                                    No applications found.
-                                </h4>
-                                <p>Please try refreshing in a while.</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
 
         {{/zone}}