Removed some leftovers for group rename.