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.old.operation-bar/operation-bar.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.old.operation-bar/operation-bar.hbs
deleted file mode 100644
index e69de29bb..000000000
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.old.operation-bar/operation-bar.js 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.old.operation-bar/operation-bar.js
deleted file mode 100644
index 18541e4a9..000000000
--- 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.old.operation-bar/operation-bar.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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.
- */
-
-function onRequest(context) {
-    var log = new Log("cdmf.unit.device.type.android.operation-bar");
-    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-    var viewModel = {};
-    var permissions = {};
-
-    // adding android operations related permission checks
-    permissions["android"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/ring")) {
-        permissions["android"].push("DEVICE_RING");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock")) {
-        permissions["android"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock")) {
-        permissions["android"].push("DEVICE_UNLOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/location")) {
-        permissions["android"].push("DEVICE_LOCATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/clear-password")) {
-        permissions["android"].push("CLEAR_PASSWORD");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/reboot")) {
-        permissions["android"].push("DEVICE_REBOOT");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/upgrade-firmware")) {
-        permissions["android"].push("UPGRADE_FIRMWARE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/mute")) {
-        permissions["android"].push("DEVICE_MUTE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/send-notification")) {
-        permissions["android"].push("NOTIFICATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/change-lock-code")) {
-        permissions["android"].push("CHANGE_LOCK_CODE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/enterprise-wipe")) {
-        permissions["android"].push("ENTERPRISE_WIPE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/wipe")) {
-        permissions["android"].push("WIPE_DATA");
-    }
-
-    // adding ios operations related permission checks
-    permissions["ios"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/lock")) {
-        permissions["ios"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/location")) {
-        permissions["ios"].push("LOCATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/enterprise-wipe")) {
-        permissions["ios"].push("ENTERPRISE_WIPE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/notification")) {
-        permissions["ios"].push("NOTIFICATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/ring")) {
-        permissions["ios"].push("RING");
-    }
-
-    // adding windows operations related permission checks
-    permissions["windows"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock")) {
-        permissions["windows"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/disenroll/windows")) {
-        permissions["windows"].push("DISENROLL");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/wipe")) {
-        permissions["windows"].push("WIPE_DATA");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/ring")) {
-        permissions["windows"].push("DEVICE_RING");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock-reset")) {
-        permissions["windows"].push("LOCK_RESET");
-    }
-
-    viewModel["permissions"] = stringify(permissions);
-
-    viewModel["deviceType"] = context.unit.params.deviceType;
-    viewModel["ownership"] = context.unit.params.ownership;
-
-    return viewModel;
-}
\ No newline at end of file
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.old.operation-bar/operation-bar.json 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.old.operation-bar/operation-bar.json
deleted file mode 100644
index e69de29bb..000000000
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.old.operation-bar/public/js/operation-bar.js 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.old.operation-bar/public/js/operation-bar.js
deleted file mode 100644
index e69de29bb..000000000
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.old.operation-bar/public/templates/hidden-operations-android.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.old.operation-bar/public/templates/hidden-operations-android.hbs
deleted file mode 100644
index b92461ff7..000000000
--- 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.old.operation-bar/public/templates/hidden-operations-android.hbs
+++ /dev/null
@@ -1,286 +0,0 @@
-<div class="row no-gutter">
-    <div class="wr-hidden-operations-nav col-lg-4">
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('security', this)" class="selected">
-                    <span class="wr-hidden-operations-icon fw-stack">
-                        <i class="fw fw-padlock fw-stack-2x"></i>
-                    </span>
-            Security
-        </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('restriction', this)">
-                <span class="wr-hidden-operations-icon fw-stack">
-                    <i class="fw fw-settings fw-stack-2x"></i>
-                </span>
-            Restrictions
-        </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('application', this)">
-                    <span class="wr-hidden-operations-icon fw-stack">
-                        <i class="fw fw-padlock fw-stack-2x"></i>
-                    </span>
-            Applications
-        </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
-                <span class="wr-hidden-operations-icon fw-stack">
-                    <i class="fw fw-wifi fw-stack-2x"></i>
-                </span>
-            Wi-fi
-        </a>
-    </div>
-    <div class="wr-hidden-operations-content col-lg-8">
-
-        <!-- security -->
-        <div class="wr-hidden-operation" data-operation="security" style="display: block">
-            <div class="panel panel-default operation-data" data-operation="{{features.ENCRYPT_STORAGE.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#enableEncryptionTab"
-                           aria-expanded="true" aria-controls="enableEncryptionTab">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Encryption Enable/Disable
-                        </a>
-                    </h2>
-                </div>
-                <div id="enableEncryptionTab" class="panel-collapse panel-body collapse in" role="tabpanel"
-                     aria-labelledby="enableEncryptionTab">
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input type="checkbox" class="operationDataKeys" id="enableEncryption"
-                                   data-key="enableEncryption"/>
-                            <span class="helper" title="Enable Encryption">Enable Encryption<span
-                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                        </label>
-                    </div>
-                    <a href="javascript:runOperation('{{features.ENCRYPT_STORAGE.code}}')" class="btn-operations">Configure</a>
-                </div>
-            </div>
-            <div class="panel panel-default operation-data" data-operation="{{features.PASSCODE_POLICY.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#passCodePolicy" aria-expanded="false"
-                           aria-controls="passCodePolicy" class="collapsed">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Passcode Policy
-                        </a>
-                    </h2>
-                </div>
-                <div id="passCodePolicy" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="passCodePolicy">
-
-                    <label class="wr-input-label col-sm-4" for="maxFailedAttempts">Maximum Failed Attempts</label>
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="maxFailedAttempts"
-                               data-key="maxFailedAttempts" placeholder="Enter maximum Failed Attempts">
-                    </div>
-
-                    <label class="wr-input-label col-sm-4" for="minLength">Minimum Length</label>
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="minLength" data-key="minLength"
-                               placeholder="Enter minimum Length">
-                    </div>
-
-                    <label class="wr-input-label col-sm-4" for="pinHistory">PIN History</label>
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="pinHistory" data-key="pinHistory"
-                               placeholder="Enter PIN History">
-                    </div>
-
-                    <label class="wr-input-label col-sm-4" for="minComplexChars">Minimum complex characters</label>
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="minComplexChars"
-                               data-key="minComplexChars" placeholder="Enter minimum complex characters">
-                    </div>
-
-                    <label class="wr-input-label col-sm-4" for="lockcode">Minimum PIN Age in days</label>
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="maxPINAgeInDays"
-                               data-key="maxPINAgeInDays" placeholder="Enter minimum PIN age in days">
-                    </div>
-
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input type="checkbox" class="operationDataKeys" id="requireAlphanumeric"
-                                   data-key="requireAlphanumeric"/>
-                            <span class="helper" title="Require Alphanumeric">Require Alphanumeric<span
-                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                        </label>
-                    </div>
-
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input type="checkbox" class="operationDataKeys" id="allowSimple" data-key="allowSimple"/>
-                            <span class="helper" title="Allow simple PIN">Allow simple PIN<span
-                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                        </label>
-                    </div>
-
-                    <a href="javascript:runOperation('{{features.PASSCODE_POLICY.code}}')" class="btn-operations">Configure</a>
-                </div>
-            </div>
-        </div>
-        <!-- /security -->
-
-        <!-- wi-fi -->
-        <div class="wr-hidden-operation panel-body" data-operation="wifi">
-            <div class="operation-data" data-operation="{{features.WIFI.code}}">
-                <label class="wr-input-label" title="Identification of the wireless network to connect to">Service Set
-                    Identifier<span class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-                <!--span>Identification of the wireless network to connect to</span-->
-                <div class="wr-input-control">
-                    <input type="text" class="form-control operationDataKeys" id="ssid" data-key="ssid"
-                           placeholder="Enter SSID"/>
-                </div>
-
-                <label class="wr-input-label" title="Password for the wireless network">Password<span
-                        class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-                <!--span>Password for the wireless network</span-->
-                <div class="wr-input-control">
-                    <input type="password" class="form-control operationDataKeys" id="password" data-key="password"
-                           placeholder="Password"/>
-                </div>
-                <a href="javascript:runOperation('{{features.WIFI.code}}')" class="btn-operations">Configure</a>
-            </div>
-
-        </div>
-        <!-- /wi-fi -->
-        <!-- application -->
-        <div class="wr-hidden-operation" data-operation="application">
-            <div class="panel panel-default operation-data" data-operation="{{features.INSTALL_APPLICATION.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#installApp" aria-expanded="true"
-                           aria-controls="installApp">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Install App
-                        </a>
-                    </h2>
-                </div>
-                <div id="installApp" class="panel-collapse panel-body collapse in" role="tabpanel"
-                     aria-labelledby="installApp">
-                    <label class="wr-input-label" title="Application Identifier">App Identifier<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="package-name"
-                               data-key="packageName" placeholder="Enter App Identifer"/>
-                    </div>
-                    <div class="wr-input-control">
-                        <label class="wr-input-control dropdown">
-                            <span class="helper" title="App Type">App Type<span
-                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                            <select class="form-control col-sm-8 operationDataKeys appTypesInput" id="type"
-                                    data-key="type">
-                                <option>Public</option>
-                                <option>Enterprise</option>
-                            </select>
-                        </label>
-                    </div>
-                    <label class="wr-input-label" title="URL">URL<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
-                               placeholder="Enter URL"/>
-                    </div>
-                    <a href="javascript:runOperation('{{features.INSTALL_APPLICATION.code}}')" class="btn-operations">Install</a>
-                </div>
-            </div>
-            <div class="panel panel-default operation-data" data-operation="{{features.WEBCLIP.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#installWebClip" aria-expanded="true"
-                           aria-controls="installWebClip" class="collapsed">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Install Web Clip
-                        </a>
-                    </h2>
-                </div>
-                <div id="installWebClip" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="installWebClip">
-                    <label class="wr-input-label" title="Title of the web clip">Title<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="title" data-key="title"
-                               placeholder="Enter Title"/>
-                    </div>
-                    <label class="wr-input-label" title="URL">URL<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="url" data-key="url"
-                               placeholder="Enter URL"/>
-                    </div>
-                    <a href="javascript:runOperation('{{features.WEBCLIP.code}}')" class="btn-operations">Install</a>
-                </div>
-            </div>
-            <div class="panel panel-default operation-data" data-operation="{{features.UNINSTALL_APPLICATION.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#uninstallApp" aria-expanded="true"
-                           aria-controls="uninstallApp" class="collapsed">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Uninstall App
-                        </a>
-                    </h2>
-                </div>
-                <div id="uninstallApp" class="panel-collapse panel-body collapse" role="tabpanel"
-                     aria-labelledby="uninstallApp">
-                    <label class="wr-input-label" title="Application Identifier">App Identifier<span
-                            class="wr-help-tip glyphicon glyphicon-question-sign"></span></label>
-                    <!--span>Identification of the wireless network to connect to</span-->
-                    <div class="wr-input-control">
-                        <input type="text" class="form-control operationDataKeys" id="package-name"
-                               data-key="packageName" placeholder="Enter App Identifer"/>
-                    </div>
-                    <a href="javascript:runOperation('{{features.UNINSTALL_APPLICATION.code}}')" class="btn-operations">Uninstall</a>
-                </div>
-            </div>
-        </div>
-        <!-- /application -->
-
-        <!-- Restriction -->
-        <div class="wr-hidden-operation" data-operation="restriction">
-            <div class="panel panel-default operation-data" data-operation="{{features.CAMERA.code}}">
-                <div class="panel-heading" role="tab">
-                    <h2 class="sub-title panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#cameraDisable" aria-expanded="true"
-                           aria-controls="cameraDisable">
-                                    <span class="fw-stack">
-                                        <i class="fw fw-ring fw-stack-2x"></i>
-                                        <i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>
-                                    </span>
-                            Camera Enable/Disable
-                        </a>
-                    </h2>
-                </div>
-                <div id="cameraDisable" class="panel-collapse panel-body collapse in" role="tabpanel"
-                     aria-labelledby="cameraDisable">
-                    <div class="wr-input-control">
-                        <label class="wr-input-control checkbox">
-                            <input type="checkbox" class="operationDataKeys" id="enableCamera" data-key="enableCamera"
-                                   checked/>
-                            <span class="helper" title="Remove App upon dis-enrollment">Enable Camera<span
-                                    class="wr-help-tip glyphicon glyphicon-question-sign"></span></span>
-                        </label>
-                    </div>
-                    <a href="javascript:runOperation('{{features.CAMERA.code}}')" class="btn-operations">Configure</a>
-                </div>
-            </div>
-        </div>
-        <!-- /Restriction -->
-    </div>
-</div>
\ No newline at end of file
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.old.operation-bar/public/templates/hidden-operations-ios.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.old.operation-bar/public/templates/hidden-operations-ios.hbs
deleted file mode 100644
index e69de29bb..000000000
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.old.operation-bar/public/templates/operations.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.old.operation-bar/public/templates/operations.hbs
deleted file mode 100644
index e69de29bb..000000000
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.operation-bar/operation-bar.json 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.operation-bar/operation-bar.json
new file mode 100644
index 000000000..688e93980
--- /dev/null
+++ 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.operation-bar/operation-bar.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file