diff --git a/settings/ajax/changegroupname.php b/settings/ajax/changegroupname.php
deleted file mode 100644
index 9bb3c0af12511f41e0ce75f955de6d5d129ea577..0000000000000000000000000000000000000000
--- a/settings/ajax/changegroupname.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-OCP\JSON::callCheck();
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAdminUser();
-
-$l=OC_L10N::get('settings');
-
-$groupname = $_POST["groupname"];
-
-// Return Success story
-// TODO : make changes to the API to allow this.
-// setGroupname doesnt exist yet.
-if(OC_Group::setGroupname($groupname)) {
-	OCP\JSON::success(
-		array("data" => array(
-			"message" => $l->t('Group name has been changed.'),
-			"groupname" => $groupname,
-			)
-		)
-	);
-} else {
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to change group name"))));
-}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index c3b8cc6a0817cb7d0f3581b78e9d51dd81e59e54..3b487624823147e549d51e224f3afa4a9c1f3ad5 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -263,37 +263,6 @@ $(document).ready( function () {
 		GroupList.showGroup(GroupList.getElementGID(this));
 	});
 
-	// Implements Groupname editing.
-	$('#app-navigation').on('click', '.isgroup .rename', function (event) {
-		event.stopPropagation();
-		var $li = $(this).closest('li');
-		var gid = GroupList.getElementGID(this);
-		var groupname = escapeHTML(gid);
-		var $input = $('<input type="text" value="' + groupname + '">');
-		$li.find('.dorename img').hide();
-		$li.find('.dorename span').replaceWith($input);
-		$input.focus();
-		$input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($input.val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changegroupname.php'),
-						{ groupname: $input.val() }
-					);
-					$input.blur();
-				} else {
-					$input.blur();
-				}
-			}
-		});
-		$input.blur(function () {
-			var $input = $(this), groupname = $input.val();
-			$input.closest('li').data('gid', groupname);
-			$input.replaceWith('<span>' + escapeHTML(groupname) + '</span>');
-			$li.find('img').show();
-		});
-	});
-
 	// Implements Quota Settings Toggle.
 	var $appSettings = $('#app-settings');
 	$('#app-settings-header').on('click keydown',function(event) {
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 466fe956cdc9cb4ee126b7f2a31d094e93ed5985..2a55f8d7b92ee74996d24a86e8b12aae29269b9d 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -38,11 +38,6 @@
 		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup">
 			<a href="#" class="dorename">
 				<span class="groupname"><?php p($group['name']); ?></span>
-				<!-- TODO: backend does not support renaming groups yet
-				<img class="svg action rename"
-					src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-					original-title="<?php p($l->t('Edit'))?>" alt="" />
-				-->
 			</a>
 			<span class="utils">
 				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
@@ -52,4 +47,4 @@
 			</span>
 		</li>
 	<?php endforeach; ?>
-</ul>
\ No newline at end of file
+</ul>