diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index d7db75ed7a..3a4de4ecde 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -373,11 +373,6 @@ tabs:
Role.shutdown_hard: true
Role.delete: true
Role.delete_recreate: true
- RoleVM.chown: true
- RoleVM.chgrp: true
- RoleVM.deploy: true
- RoleVM.migrate: true
- RoleVM.migrate_live: true
RoleVM.hold: true
RoleVM.release: true
RoleVM.suspend: true
diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml
index b72abc2263..381961171e 100644
--- a/src/sunstone/etc/sunstone-views/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/cloud.yaml
@@ -374,11 +374,6 @@ tabs:
Role.shutdown_hard: true
Role.delete: true
Role.delete_recreate: true
- RoleVM.chown: false
- RoleVM.chgrp: false
- RoleVM.deploy: false
- RoleVM.migrate: false
- RoleVM.migrate_live: false
RoleVM.hold: true
RoleVM.release: true
RoleVM.suspend: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index e6b82c59b4..a62df2c8c3 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -375,11 +375,6 @@ tabs:
Role.shutdown_hard: true
Role.delete: true
Role.delete_recreate: true
- RoleVM.chown: false
- RoleVM.chgrp: false
- RoleVM.deploy: false
- RoleVM.migrate: false
- RoleVM.migrate_live: false
RoleVM.hold: true
RoleVM.release: true
RoleVM.suspend: true
diff --git a/src/sunstone/etc/sunstone-views/vdcadmin.yaml b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
index 37b53940a3..d5a6a1b4b5 100644
--- a/src/sunstone/etc/sunstone-views/vdcadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
@@ -376,11 +376,6 @@ tabs:
Role.shutdown_hard: true
Role.delete: true
Role.delete_recreate: true
- RoleVM.chown: false
- RoleVM.chgrp: false
- RoleVM.deploy: false
- RoleVM.migrate: false
- RoleVM.migrate_live: false
RoleVM.hold: true
RoleVM.release: true
RoleVM.suspend: true
diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js
index 1b40c156e5..dbbe01f3ff 100644
--- a/src/sunstone/public/js/plugins/oneflow-services.js
+++ b/src/sunstone/public/js/plugins/oneflow-services.js
@@ -768,48 +768,48 @@ var role_buttons = {
var role_vm_buttons = {
- "RoleVM.chown" : {
- type: "confirm_with_select",
- text: tr("Change owner"),
- select: users_sel,
- layout: "user_select",
- tip: tr("Select the new owner")+":",
- condition: mustBeAdmin
- },
-
- "RoleVM.chgrp" : {
- type: "confirm_with_select",
- text: tr("Change group"),
- select: groups_sel,
- layout: "user_select",
- tip: tr("Select the new group")+":",
- condition: mustBeAdmin
- },
- "RoleVM.deploy" : {
- type: "confirm_with_select",
- text: tr("Deploy"),
- tip: tr("This will deploy the selected VMs on the chosen host"),
- layout: "vmsplanification_buttons",
- select: hosts_sel,
- condition: mustBeAdmin
- },
- "RoleVM.migrate" : {
- type: "confirm_with_select",
- text: tr("Migrate"),
- tip: tr("This will migrate the selected VMs to the chosen host"),
- layout: "vmsplanification_buttons",
- select: hosts_sel,
- condition: mustBeAdmin
-
- },
- "RoleVM.migrate_live" : {
- type: "confirm_with_select",
- text: tr("Migrate") + ' live',
- tip: tr("This will live-migrate the selected VMs to the chosen host"),
- layout: "vmsplanification_buttons",
- select: hosts_sel,
- condition: mustBeAdmin
- },
+// "RoleVM.chown" : {
+// type: "confirm_with_select",
+// text: tr("Change owner"),
+// select: users_sel,
+// layout: "user_select",
+// tip: tr("Select the new owner")+":",
+// condition: mustBeAdmin
+// },
+//
+// "RoleVM.chgrp" : {
+// type: "confirm_with_select",
+// text: tr("Change group"),
+// select: groups_sel,
+// layout: "user_select",
+// tip: tr("Select the new group")+":",
+// condition: mustBeAdmin
+// },
+// "RoleVM.deploy" : {
+// type: "confirm_with_select",
+// text: tr("Deploy"),
+// tip: tr("This will deploy the selected VMs on the chosen host"),
+// layout: "vmsplanification_buttons",
+// select: hosts_sel,
+// condition: mustBeAdmin
+// },
+// "RoleVM.migrate" : {
+// type: "confirm_with_select",
+// text: tr("Migrate"),
+// tip: tr("This will migrate the selected VMs to the chosen host"),
+// layout: "vmsplanification_buttons",
+// select: hosts_sel,
+// condition: mustBeAdmin
+//
+// },
+// "RoleVM.migrate_live" : {
+// type: "confirm_with_select",
+// text: tr("Migrate") + ' live',
+// tip: tr("This will live-migrate the selected VMs to the chosen host"),
+// layout: "vmsplanification_buttons",
+// select: hosts_sel,
+// condition: mustBeAdmin
+// },
"RoleVM.hold" : {
type: "action",
text: tr("Hold"),