diff --git a/gui/app/components/folder/category-admin.js b/gui/app/components/folder/category-admin.js
index b86649db..ca79cb3e 100644
--- a/gui/app/components/folder/category-admin.js
+++ b/gui/app/components/folder/category-admin.js
@@ -17,7 +17,6 @@ import ModalMixin from '../../mixins/modal';
 import Component from '@ember/component';
 
 export default Component.extend(ModalMixin, TooltipMixin, {
-	// userService: service('user'),
 	spaceSvc: service('folder'),
 	groupSvc: service('group'),
 	categorySvc: service('category'),
diff --git a/gui/app/models/document-role.js b/gui/app/models/document-permission.js
similarity index 62%
rename from gui/app/models/document-role.js
rename to gui/app/models/document-permission.js
index 74361688..87809744 100644
--- a/gui/app/models/document-role.js
+++ b/gui/app/models/document-permission.js
@@ -15,11 +15,11 @@ import attr from 'ember-data/attr';
 export default Model.extend({
 	orgId: attr('string'),
 	documentId: attr('string'),
-	userId: attr('string'),
-	fullname: attr('string'), // client-side usage only, not from API
-
-	documentEdit: attr('boolean'), 			// space level setting
-	documentApprove: attr('boolean'),		// space level setting
-	documentRoleEdit: attr('boolean'),		// document level setting
-	documentRoleApprove: attr('boolean')	// document level setting
+	whoId: attr('string'),
+	who: attr('string'),
+	name: attr('string'),
+	documentEdit: attr('boolean'),
+	documentApprove: attr('boolean'),
+	documentRoleEdit: attr('boolean'),
+	documentRoleApprove: attr('boolean')
 });
diff --git a/gui/app/serializers/document-role.js b/gui/app/serializers/document-permission.js
similarity index 81%
rename from gui/app/serializers/document-role.js
rename to gui/app/serializers/document-permission.js
index 2c2733a5..c6542cf8 100644
--- a/gui/app/serializers/document-role.js
+++ b/gui/app/serializers/document-permission.js
@@ -4,7 +4,7 @@ export default ApplicationSerializer.extend({
 	normalize(modelClass, resourceHash) {
 		return {
 			data: {
-				id: resourceHash.userId ? resourceHash.userId : 0,
+				id: resourceHash.whoId ? resourceHash.whoId : 0,
 				type: modelClass.modelName,
 				attributes: resourceHash
 			}
diff --git a/gui/app/services/document.js b/gui/app/services/document.js
index 37372e65..b6e5723d 100644
--- a/gui/app/services/document.js
+++ b/gui/app/services/document.js
@@ -343,7 +343,7 @@ export default Service.extend({
 			perms = this.get('store').push(perms);
 			this.get('folderService').set('permissions', perms);
 
-			let roles = this.get('store').normalize('document-role', response.roles);
+			let roles = this.get('store').normalize('document-permission', response.roles);
 			roles = this.get('store').push(roles);
 
 			let folders = response.folders.map((obj) => {
diff --git a/server/routing/routes.go b/server/routing/routes.go
index be93dbe4..b59815b8 100644
--- a/server/routing/routes.go
+++ b/server/routing/routes.go
@@ -97,10 +97,6 @@ func RegisterEndpoints(rt *env.Runtime, s *domain.Store) {
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"GET", "OPTIONS"}, nil, document.Get)
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"PUT", "OPTIONS"}, nil, document.Update)
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}", []string{"DELETE", "OPTIONS"}, nil, document.Delete)
-	// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions", []string{"GET", "OPTIONS"}, nil, permission.GetDocumentPermissions)
-	// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions", []string{"PUT", "OPTIONS"}, nil, permission.SetDocumentPermissions)
-	// Add(rt, RoutePrefixPrivate, "documents/{documentID}/permissions/user", []string{"GET", "OPTIONS"}, nil, permission.GetUserDocumentPermissions)
-
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/level", []string{"POST", "OPTIONS"}, nil, page.ChangePageLevel)
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/sequence", []string{"POST", "OPTIONS"}, nil, page.ChangePageSequence)
 	Add(rt, RoutePrefixPrivate, "documents/{documentID}/pages/{pageID}/revisions", []string{"GET", "OPTIONS"}, nil, page.GetRevisions)