Remove unused group model code

18 files changed, 39 insertions, 1343 deletions

diff --git a/admin/admin_login_inc.php b/admin/admin_login_inc.php
index 555ed9e..7e7306f 100755
--- a/admin/admin_login_inc.php
+++ b/admin/admin_login_inc.php
@@ -272,22 +272,22 @@ if( !empty( $_POST ) ) {
 	simple_set_value( 'users_auth_method', USERS_PKG_NAME );
 	simple_set_value( 'users_validate_email_group', USERS_PKG_NAME );
 
-	if( isset( $_REQUEST['registration_group_choice'] ) ) {
+	if( isset( $_REQUEST['registration_role_choice'] ) ) {
 		$listHash = [];
-		$groupList = $gBitUser->getAllRoles( $listHash );
+		$roleList = $gBitUser->getAllRoles( $listHash );
 
 		$in = [];
 		$out = [];
-		foreach( $groupList as $gr ) {
-			if( $gr['group_id'] == ANONYMOUS_GROUP_ID ) {
+		foreach( $roleList as $ro ) {
+			if( $ro['role_id'] == ANONYMOUS_TEAM_ID ) {
 				continue;
 			}
 
-			// work out if someting has been selected or deselected
-			if( $gr['is_public'] == 'y' && !in_array( $gr['group_id'], $_REQUEST['registration_group_choice'] )) {
-				$out[] = $gr['group_id'];
-			} elseif( $gr['is_public'] != 'y' && in_array( $gr['group_id'], $_REQUEST['registration_group_choice'] )) {
-				$in[] = $gr['group_id'];
+			// work out if something has been selected or deselected
+			if( $ro['is_public'] == 'y' && !in_array( $ro['role_id'], $_REQUEST['registration_role_choice'] )) {
+				$out[] = $ro['role_id'];
+			} elseif( $ro['is_public'] != 'y' && in_array( $ro['role_id'], $_REQUEST['registration_role_choice'] )) {
+				$in[] = $ro['role_id'];
 			}
 		}
 		if( count( $in ) ) {
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
deleted file mode 100755
index 7cad315..0000000
--- a/admin/upgrade_inc.php
+++ /dev/null
@@ -1,632 +0,0 @@
-<?php
-global $gBitSystem, $gUpgradeFrom, $gUpgradeTo, $gBitDb;
-
-$upgrades = [
-
-'TIKIWIKI19' =>  [
-	'TIKIWIKI18' =>  [
-
-[ 'DATADICT' => [
-[ 'ALTER' => [
-	'tiki_user_tasks' => [
-		'title' => [ '`title`', 'VARCHAR(250)' ],
-		'description' => [ '`description`', 'X' ],
-	],
-]],
-[ 'RENAMECOLUMN' => [
-	'tiki_pages' => [ '`created`' => '`date` I8' ],
-]],
-]],
-
-[ 'QUERY' =>
-	[ 'SQL92' => [
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_tasks` SET `title`= (SELECT `title` FROM `".BIT_DB_PREFIX."tiki_user_tasks_history` WHERE `".BIT_DB_PREFIX."tiki_user_tasks`.`taskId`=`belongs_to`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_tasks` SET `description`= (SELECT `description` FROM `".BIT_DB_PREFIX."tiki_user_tasks_history` WHERE `".BIT_DB_PREFIX."tiki_user_tasks`.`taskId`=`belongs_to`)",
-	],
-], ],
-
-/*
-
-alter table tiki_user_modules add parse char(1) default NULL;
-
-CREATE TABLE tiki_user_tasks_history (
-  belongs_to integer(14) NOT NULL,                   -- the fist task in a history it has the same id as the task id
-  task_version integer(4) NOT NULL DEFAULT 0,        -- version number for the history it starts with 0
-  title varchar(250) NOT NULL,                       -- title
-  description text DEFAULT NULL,                     -- description
-  start integer(14) DEFAULT NULL,                    -- date of the starting, if it is not set than there is not starting date
-  end integer(14) DEFAULT NULL,                      -- date of the end, if it is not set than there is not dealine
-  lasteditor varchar(200) NOT NULL,                  -- lasteditor: username of last editior
-  lastchanges integer(14) NOT NULL,                  -- date of last changes
-  priority integer(2) NOT NULL DEFAULT 3,            -- priority
-  completed integer(14) DEFAULT NULL,                -- date of the completation if it is null it is not yet completed
-  deleted integer(14) DEFAULT NULL,                  -- date of the deleteation it it is null it is not deleted
-  status char(1) DEFAULT NULL,                       -- null := waiting,
-													 -- o := open / in progress,
-													 -- c := completed -> (percentage = 100)
-  percentage int(4) DEFAULT NULL,
-  accepted_creator char(1) DEFAULT NULL,             -- y - yes, n - no, null - waiting
-  accepted_user char(1) DEFAULT NULL,                -- y - yes, n - no, null - waiting
-  PRIMARY KEY (belongs_to, task_version)
-) AUTO_INCREMENT=1 ;
-UPDATE tiki_user_tasks set title = '-'  where title IS NULL;
-INSERT INTO tiki_user_tasks_history (belongs_to, title, start, description, lasteditor, lastchanges, priority, completed, status, percentage) SELECT  taskId, title, date, description, user, date, priority, completed, status, percentage FROM tiki_user_tasks;
-ALTER TABLE tiki_user_tasks ADD last_version integer(4) NOT NULL DEFAULT 0 AFTER taskId;
-ALTER TABLE tiki_user_tasks MODIFY user varchar(200) NOT NULL DEFAULT '';
-ALTER TABLE tiki_user_tasks ADD creator varchar(200) NOT NULL AFTER user;
-ALTER TABLE tiki_user_tasks ADD public_for_group varchar(30) DEFAULT NULL AFTER creator;
-ALTER TABLE tiki_user_tasks ADD rights_by_creator char(1) DEFAULT NULL AFTER public_for_group;
-ALTER TABLE tiki_user_tasks ADD status char(1) default NULL;
-ALTER TABLE tiki_user_tasks ADD priority int(2) default NULL;
-ALTER TABLE tiki_user_tasks ADD completed int(14) default NULL;
-ALTER TABLE tiki_user_tasks ADD percentage int(4) default NULL;
-*/
-
-	],
-],
-
-'BONNIE' => [
-	'BWR1' => [
-
-// STEP 1
-[ 'QUERY' =>
-	[ 'MYSQL' => [
-	"ALTER TABLE `".BIT_DB_PREFIX."tiki_user_preferences` DROP PRIMARY KEY",
-	"ALTER TABLE `".BIT_DB_PREFIX."users_usergroups` DROP PRIMARY KEY",
-	"ALTER TABLE `".BIT_DB_PREFIX."users_grouppermissions` DROP PRIMARY KEY",
-	"ALTER TABLE `".BIT_DB_PREFIX."tiki_group_inclusion` DROP PRIMARY KEY",
-	"ALTER TABLE `".BIT_DB_PREFIX."tiki_user_watches` DROP PRIMARY KEY",
-	]],
-],
-
-// STEP 1
-[ 'DATADICT' => [
-[ 'RENAMETABLE' => [
-		'users_usergroups' => 'users_groups_map',
-		'tiki_group_inclusion' => 'users_groups_inclusion',
-	],
-],
-[ 'RENAMECOLUMN' => [
-	'users_users' => [
-		'`userId`' => '`user_id` I4',
-		'`lastLogin`' => '`last_login` I8',
-		'`currentLogin`' => '`current_login` I8',
-		'`registrationDate`' => '`registration_date` I8',
-//		'`avatarName`' => '`avatar_name`',
-//		'`avatarSize`' => '`avatar_size`',
-//		'`avatarFileType`' => '`avatar_file_type`',
-//		'`avatarData`' => '`avatar_data`',
-//		'`avatarLibName`' => '`avatar_lib_name`',
-//		'`avatarType`' => '`avatar_type`',
-	],
-	'users_groups_map' => [
-		'`userId`' => '`user_id` I4',
-	],
-	'tiki_semaphores' => [ '`semName`' => '`sem_name` C(250)',
-							   '`timestamp`' => '`created` I8', ],
-	'tiki_user_preferences' => [
-		'`prefName`' => '`pref_name` C(40)',
-	],
-//	'users_groups_inclusion' => array('`groupName`', '`group_name`'),
-//	'users_groups_inclusion' => array('`includeGroup`', '`include_group`'),
-	'tiki_user_bookmarks_folders' => [
-		'`folderId`' => '`folder_id` I4',
-		'`parentId`' => '`parent_id` I4',
-	],
-	'tiki_user_bookmarks_urls' => [
-		'`urlId`' => '`url_id` I4',
-		'`lastUpdated`' => '`last_updated` I8',
-		'`folderId`' => '`folder_id` I4',
-	],
-	'tiki_user_menus' => [
-		'`menuId`' => '`menu_id` I4',
-	],
-	'users_grouppermissions' => [
-		'`permName`' => '`perm_name` C(30)',
-	],
-	'users_groups' => [
-		'`groupName`' => '`group_name` C(30)',
-		'`groupDesc`' => '`group_desc` C(255)',
-		'`groupHome`' => '`group_home` C(255)',
-	],
-	'users_groups_map' => [
-		'`userId`' => '`user_id` I4',
-	],
-	'users_objectpermissions' => [
-		'`permName`' => '`perm_name` C(30)',
-		'`objectType`' => '`object_type` C(20)',
-	],
-	'users_permissions' => [
-		'`permName`' => '`perm_name` C(30)',
-		'`permDesc`' => '`perm_desc` C(250)',
-		'`type`' => '`package` C(100)',
-	],
-	'tiki_userfiles' => [
-		'`fileId`' => '`file_id` I4',
-		'`isFile`' => '`is_file` C(1)',
-	],
-	'tiki_user_tasks' => [
-		'`taskId`' => '`task_id` I4' ,
-	],
-]],
-
-[ 'ALTER' => [
-	'users_users' => [
-		'content_id' => [ '`content_id`', 'I4' ],
-		'default_group_id' => [ '`default_group_id`', 'I4' ],
-		'real_name' => [ '`real_name`', 'VARCHAR(64)'],
-		'avatar_attachment_id' => [ '`avatar_attachment_id`', 'I4' ],
-		'portrait_attachment_id' => [ '`portrait_attachment_id`', 'I4' ],
-		'logo_attachment_id' => [ '`logo_attachment_id`', 'I4' ],
-
-	],
-	'tiki_semaphores' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_sessions' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-		'session_id' => [ '`session_id`', 'VARCHAR(32)' ],
-	],
-	'tiki_user_bookmarks_folders' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_user_bookmarks_urls' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_user_menus' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_user_preferences' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_user_tasks' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'tiki_user_watches' => [
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'users_groups' => [
-		'group_id' => [ '`group_id`', 'I4' ],
-		'user_id' => [ '`user_id`', 'I4' ],
-	],
-	'users_grouppermissions' => [
-		'group_id' => [ '`group_id`', 'I4' ],
-	],
-	'users_objectpermissions' => [
-		'group_id' => [ '`group_id`', 'I4' ],
-		'object_id' => [ '`object_id`', 'I4' ],
-	],
-	'users_groups_map' => [
-		'group_id' => [ '`group_id`', 'I4' ],
-	],
-	'users_groups_inclusion' => [
-		'group_id' => [ '`group_id`', 'I4' ],
-		'include_group_id' => [ '`include_group_id`', 'I4' ],
-	],
-]],
-
-[ 'CREATE' =>  [
-'users_cnxn' => "
-  user_id I4,
-  cookie C(64),
-  ip C(16),
-  last_get I8,
-  connect_time I8,
-  get_count I8,
-  user_agent C(128),
-  current_view X
-  CONSTRAINTS	', CONSTRAINT `users_cnxn_user_ref` FOREIGN KEY (`user_id`) REFERENCES `".BIT_DB_PREFIX."users_users` (`user_id`)'
-",
-
-]],
-
-]],
-
-// STEP 2
-[ 'PHP' => '
-	global $gBitSystem, $gBitDb;
-	$max = $gBitDb->GetOne( "SELECT MAX(user_id) FROM `'.BIT_DB_PREFIX.'users_users`" );
-	$gBitSystem->mDb->CreateSequence( "users_users_user_id_seq", $max + 1 );
-	$gBitSystem->mDb->CreateSequence( "users_groups_id_seq", 1 );
-	$gBitDb->query( "UPDATE `'.BIT_DB_PREFIX.'users_groups` SET `group_id`=-1 WHERE group_name=\'Anonymous\'" );
-	$gBitDb->query( "INSERT INTO `'.BIT_DB_PREFIX.'users_groups_map` (`group_id`,`user_id`,`groupName`) VALUES ( -1, '.ANONYMOUS_USER_ID.',\'Anonymous\' )" );
-	$groupNames = $gBitDb->GetCol( "SELECT `group_name` FROM `'.BIT_DB_PREFIX.'users_groups` WHERE `group_name` != \'Anonymous\'" );
-	foreach( $groupNames as $name ) {
-		$id = $gBitDb->GenID( "users_groups_id_seq" );
-		$gBitDb->query( "UPDATE `'.BIT_DB_PREFIX.'users_groups` SET group_id=? WHERE group_name=?", array( $id, $name ) );
-	}
-' ],
-
-// STEP 3
-[ 'QUERY' =>
-	[ 'SQL92' => [
-		"UPDATE `".BIT_DB_PREFIX."users_grouppermissions` SET `perm_name`=replace(`perm_name`,'tiki_','bit_')",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`=replace(`perm_name`,'tiki_','bit_')",
-		"UPDATE `".BIT_DB_PREFIX."users_objectpermissions` SET `perm_name`=replace(`perm_name`,'tiki_','bit_')",
-
-		"INSERT INTO `".BIT_DB_PREFIX."users_users` (`real_name`, `login`, `email`, `user_id` ) VALUES ('Anonymous', 'anonymous', 'anonymous@localhost', ".ANONYMOUS_USER_ID.")",
-// TikiWiki assigns the creator user foreign key as 'system' even if there is now 'system' user - XOXO spiderr
-// In order for all pages to upgrade, there must be at least an 'admin' and 'system' user
-		"INSERT INTO `".BIT_DB_PREFIX."users_users` (`real_name`, `login`, `email`, `user_id` ) VALUES ('Administrator', 'admin', 'root@localhost', ".ROOT_USER_ID.")",
-		"INSERT INTO `".BIT_DB_PREFIX."users_users` (`real_name`, `login`, `email` ) VALUES ('System', 'system', 'system@localhost' )",
-		"UPDATE `".BIT_DB_PREFIX."tiki_semaphores` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_semaphores`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_semaphores` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_semaphores`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_sessions` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_sessions`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_preferences` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_preferences`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_bookmarks_folders` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_bookmarks_folders`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_bookmarks_urls` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_bookmarks_urls`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_menus` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_menus`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_tasks` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_tasks`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."tiki_user_watches` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_user_watches`.`user`)",
-		"UPDATE `".BIT_DB_PREFIX."users_groups_map` SET `group_id`=(SELECT `group_id` FROM `".BIT_DB_PREFIX."users_groups` WHERE `".BIT_DB_PREFIX."users_groups`.`group_name`=`".BIT_DB_PREFIX."users_groups_map`.`groupName`)",
-		"UPDATE `".BIT_DB_PREFIX."users_grouppermissions` SET `group_id`=(SELECT `group_id` FROM `".BIT_DB_PREFIX."users_groups` WHERE `".BIT_DB_PREFIX."users_groups`.`group_name`=`".BIT_DB_PREFIX."users_grouppermissions`.`groupName`)",
-		"UPDATE `".BIT_DB_PREFIX."users_objectpermissions` SET `group_id`=(SELECT `group_id` FROM `".BIT_DB_PREFIX."users_groups` WHERE `".BIT_DB_PREFIX."users_groups`.`group_name`=`".BIT_DB_PREFIX."users_objectpermissions`.`groupName`)",
-		"UPDATE `".BIT_DB_PREFIX."users_groups_inclusion` SET `group_id`=(SELECT `group_id` FROM `".BIT_DB_PREFIX."users_groups` WHERE `group_name`=`".BIT_DB_PREFIX."users_groups_inclusion`.`groupName`)",
-		"UPDATE `".BIT_DB_PREFIX."users_groups_inclusion` SET `include_group_id`=(SELECT `group_id` FROM `".BIT_DB_PREFIX."users_groups` WHERE `group_name`=`includeGroup`)",
-		"UPDATE `".BIT_DB_PREFIX."users_groups` SET `user_id`=1",
-		"UPDATE `".BIT_DB_PREFIX."users_groups` SET `is_default`='y' WHERE `group_name`='Registered'",
-		"alter table `".BIT_DB_PREFIX."tiki_user_watches` add index `user_id` (`user_id`)",
-		"update `".BIT_DB_PREFIX."tiki_user_watches` set `type` = 'bitpage' where `type` = 'Wiki page'",
-		"update `".BIT_DB_PREFIX."tiki_user_watches` set `type` = 'bitpage' where `type` = 'Wiki-Seite'",
-
-	],
-], ],
-
-// STEP 4
-[ 'DATADICT' => [
-[ 'DROPCOLUMN' => [
-		'tiki_semaphores' => [ '`user`' ],
-		'tiki_sessions' => [ '`user`', '`sessionId`' ],
-		'users_groups_map' => [ '`groupName`' ],
-		'users_grouppermissions' => [ '`groupName`' ],
-		'users_objectpermissions' => [ '`groupName`' ],
-		'users_groups_inclusion' => [ '`groupName`' ],
-		'tiki_user_bookmarks_folders' => [ '`user`' ],
-		'tiki_user_bookmarks_urls' => [ '`user`' ],
-		'tiki_user_menus' => [ '`user`' ],
-		'tiki_user_preferences' => [ '`user`' ],
-		'tiki_user_tasks' => [ '`user`' ],
-		'tiki_user_watches' => [ '`user`' ],
-	]],
-]],
-
-// STEP 5
-[ 'QUERY' =>
-	[ 'SQL92' => [
-		"INSERT INTO `".BIT_DB_PREFIX."users_groups_map` (`group_id`, `user_id` ) VALUES ( -1, ".ANONYMOUS_USER_ID." )",
-	],
-], ],
-
-// STEP 2
-[ 'PHP' => '
-	global $gBitSystem, $gBitDb;
-	$adminGroup = $gBitDb->GetOne( "SELECT `group_id` FROM `'.BIT_DB_PREFIX.'users_grouppermissions` where perm_name=\'bit_p_admin\'" );
-	if( empty( $adminGroup ) ) {
-		$adminGroup = $gBitDb->GetOne( "SELECT `group_id` FROM `'.BIT_DB_PREFIX.'users_groups` where LOWER(`group_name`) LIKE \'administrator%\'" );
-		if( empty( $adminGroup ) ) {
-			$adminGroup = $gBitDb->GenID( "users_groups_id_seq" );
-			$gBitDb->query( "INSERT INTO `'.BIT_DB_PREFIX.'users_groups` (`group_id`,`group_name`) VALUES ( $adminGroup, \'Administrators\' )" );
-		}
-		$gBitDb->query( "INSERT INTO `'.BIT_DB_PREFIX.'users_groups_map` (`group_id`,`user_id`) VALUES ( $adminGroup, '.ROOT_USER_ID.' )" );
-		$gBitDb->query( "INSERT INTO `'.BIT_DB_PREFIX.'users_grouppermissions` (`perm_name`, `group_id`) VALUES( \'bit_p_admin\', $adminGroup )" );
-	}
-' ],
-
-// STEP 4
-[ 'DATADICT' => [
-[ 'CREATEINDEX' => [
-		'tiki_sema_user_idx' => [ 'tiki_semaphores', '`user_id`', [] ],
-		'tiki_user_prefs_idx' => [ 'tiki_user_preferences', '`user_id`', [] ],
-		'tiki_user_prefs_un_idx' => [ 'tiki_user_preferences', '`user_id`,`pref_name`', [ 'UNIQUE' ] ],
-		'users_groups_map_user_idx' => [ 'users_groups_map', '`user_id`', [] ],
-		'users_groups_map_group_idx' => [ 'users_groups_map', '`group_id`', [] ],
-		'users_groups_map_ug_idx' => [ 'users_groups_map', '`user_id`,`group_id`', [ 'UNIQUE' ] ],
-		'users_groupperms_group_idx' => [ 'users_grouppermissions', '`group_id`', [] ],
-		'users_groupperms_group_idx' => [ 'users_grouppermissions', '`group_id`,`perm_name`', [ 'UNIQUE' ] ],
-		'users_groups_inc_group_idx' => [ 'users_groups_inclusion', '`group_id`', [] ],
-		'users_groups_inc_gi_idx' => [ 'users_groups_inclusion', '`group_id`,`include_group_id`', [ 'UNIQUE' ] ],
-		'users_groups_gi_idx'  => [ 'users_groups', '`group_id`', ['UNIQUE'] ],
-	]],
-]],
-
-	],
-],
-
-'BWR1' => [
-	'BWR2' => [
-// STEP 1
-[ 'DATADICT' => [
-	[ 'CREATE' =>  [
-		'users_favorites_map' => "
-		  favorite_content_id I4 PRIMARY,
-		  user_id I4 PRIMARY,
-		  map_position I4
-		  CONSTRAINT ', CONSTRAINT `users_fav_user_ref` FOREIGN KEY (`user_id`) REFERENCES `".BIT_DB_PREFIX."users_users` (`user_id`)'
-		",
-	]],
-	[ 'RENAMETABLE' => [
-		'tiki_semaphores'             => 'users_semaphores',
-		'users_objectpermissions'     => 'users_object_permissions',
-		'users_grouppermissions'      => 'users_group_permissions',
-		'tiki_user_watches'           => 'users_watches',
-	]],
-	[ 'RENAMECOLUMN' => [
-		'users_watches' => [
-			'`type`' => '`watch_type` C(200)',
-		],
-		'users_group_permissions' => [
-			'`value`' => "`perm_value` C(1) default ''",
-		],
-		'users_users' => [
-			'`password`' => '`user_password` C(32)',
-		],
-		'users_permissions' => [
-			'`level`' => '`perm_level` C(80)',
-		],
-	]],
-	[ 'DROPTABLE' => [
-		'tiki_sessions',
-		'users_groups_inclusion',
-	]],
-]],
-
-[ 'QUERY' =>
-	[ 'SQL92' => [
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_shoutbox_view' WHERE `perm_name`='bit_p_view_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_shoutbox_admin' WHERE `perm_name`='bit_p_admin_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_shoutbox_post' WHERE `perm_name`='bit_p_post_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_xmlrpc_send_content' WHERE `perm_name`='bit_p_send_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_xmlrpc_sendme_content' WHERE `perm_name`='bit_p_sendme_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_xmlrpc_admin_content' WHERE `perm_name`='bit_p_admin_received_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_admin' WHERE `perm_name`='bit_p_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_access_closed_site' WHERE `perm_name`='bit_p_access_closed_site'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_gatekeeper_create' WHERE `perm_name`='bit_p_create_gatekeeper'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_gatekeeper_edit' WHERE `perm_name`='bit_p_gatekeeper_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_gatekeeper_admin' WHERE `perm_name`='bit_p_gatekeeper_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_gatekeeper_read' WHERE `perm_name`='bit_p_read_gatekeeper'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_calendar_view' WHERE `perm_name`='bit_p_view_calendar'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_sample_admin' WHERE `perm_name`='bit_p_admin_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_sample_create' WHERE `perm_name`='bit_p_create_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_sample_edit' WHERE `perm_name`='bit_p_edit_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_sample_read' WHERE `perm_name`='bit_p_read_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_sample_remove' WHERE `perm_name`='bit_p_remove_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_categories_admin' WHERE `perm_name`='bit_p_admin_categories'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_categories_view' WHERE `perm_name`='bit_p_view_categories'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_admin_banning' WHERE `perm_name`='bit_p_admin_banning'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_upload_userfiles' WHERE `perm_name`='bit_p_userfiles'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_create_bookmarks' WHERE `perm_name`='bit_p_create_bookmarks'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_cache_bookmarks' WHERE `perm_name`='bit_p_cache_bookmarks'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_configure_modules' WHERE `perm_name`='bit_p_configure_modules'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_use_usermenu' WHERE `perm_name`='bit_p_usermenu'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_use_tasks' WHERE `perm_name`='bit_p_tasks'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_custom_home_theme' WHERE `perm_name`='bit_p_custom_home_theme'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_custom_home_layout' WHERE `perm_name`='bit_p_custom_home_layout'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_use_custom_css' WHERE `perm_name`='bit_p_custom_css'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_tidbits_edit_fortune_cookies' WHERE `perm_name`='bit_p_edit_cookies'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_quota_create' WHERE `perm_name`='bit_p_create_quota'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_quota_edit' WHERE `perm_name`='bit_p_quota_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_quota_admin' WHERE `perm_name`='bit_p_quota_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_quota_read' WHERE `perm_name`='bit_p_read_quota'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_smileys_use' WHERE `perm_name`='bit_p_use_smileys'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_chatterbox_use' WHERE `perm_name`='bit_p_use_chatterbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_view' WHERE `perm_name`='bit_p_view_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_create' WHERE `perm_name`='bit_p_create_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_edit' WHERE `perm_name`='bit_p_edit_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_upload' WHERE `perm_name`='bit_p_upload_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_admin' WHERE `perm_name`='bit_p_admin_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_fisheye_upload_nonimages' WHERE `perm_name`='bit_p_fisheye_upload_nonimages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_languages_create' WHERE `perm_name`='bit_p_create_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_languages_edit' WHERE `perm_name`='bit_p_edit_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_languages_delete' WHERE `perm_name`='bit_p_delete_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_languages_edit_master' WHERE `perm_name`='bit_p_edit_master_strings'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_languages_import' WHERE `perm_name`='bit_p_import_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_assign_group_perms' WHERE `perm_name`='bit_p_user_group_perms'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_assign_group_members' WHERE `perm_name`='bit_p_user_group_members'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_group_subgroups' WHERE `perm_name`='bit_p_user_group_subgroups'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_admin' WHERE `perm_name`='bit_p_admin_users'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_view_icons_and_tools' WHERE `perm_name`='bit_p_view_tabs_and_tools'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_create_personal_groups' WHERE `perm_name`='bit_p_create_personal_groups'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_view_user_list' WHERE `perm_name`='bit_p_view_user_list'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_view_user_homepage' WHERE `perm_name`='bit_p_view_user_homepage'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_users_edit_user_homepage' WHERE `perm_name`='bit_p_edit_user_homepage'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_galaxia_admin' WHERE `perm_name`='bit_p_admin_workflow'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_galaxia_abort_instance' WHERE `perm_name`='bit_p_abort_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_galaxia_use' WHERE `perm_name`='bit_p_use_workflow'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_galaxia_exception_instance' WHERE `perm_name`='bit_p_exception_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_galaxia_send_instance' WHERE `perm_name`='bit_p_send_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_newsletters_admin' WHERE `perm_name`='bit_p_admin_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_newsletters_create' WHERE `perm_name`='bit_p_create_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_newsletters_create_editions' WHERE `perm_name`='bit_p_create_editions'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_newsletters_subscribe' WHERE `perm_name`='bit_p_subscribe_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_newsletters_subscribe_email' WHERE `perm_name`='bit_p_subscribe_email'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_blogs_create' WHERE `perm_name`='bit_p_create_blogs'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_blogs_create_public_blog' WHERE `perm_name`='bit_p_create_public_blog'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_blogs_post' WHERE `perm_name`='bit_p_blog_post'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_blogs_admin' WHERE `perm_name`='bit_p_blog_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_blogs_view' WHERE `perm_name`='bit_p_read_blog'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_pdf_generation' WHERE `perm_name`='bit_p_pdf_generation'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_messages_send' WHERE `perm_name`='bit_p_messages'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_edit_dynvar' WHERE `perm_name`='bit_p_edit_dynvar'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_edit_page' WHERE `perm_name`='bit_p_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_view_page' WHERE `perm_name`='bit_p_view'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_remove_page' WHERE `perm_name`='bit_p_remove'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_rollback' WHERE `perm_name`='bit_p_rollback'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_admin' WHERE `perm_name`='bit_p_admin_wiki'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_save_minor' WHERE `perm_name`='bit_p_minor'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_rename_page' WHERE `perm_name`='bit_p_rename'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_lock_page' WHERE `perm_name`='bit_p_lock'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_edit_book' WHERE `perm_name`='bit_p_edit_books'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_admin_book' WHERE `perm_name`='bit_p_admin_books'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_wiki_edit_copyright' WHERE `perm_name`='bit_p_edit_copyrights'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_pigeonholes_view' WHERE `perm_name`='bit_p_view_pigeonholes'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_pigeonholes_insert_member' WHERE `perm_name`='bit_p_insert_pigeonhole_member'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_pigeonholes_edit' WHERE `perm_name`='bit_p_edit_pigeonholes'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_stickies_edit' WHERE `perm_name`='bit_p_stickies_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_stickies_admin' WHERE `perm_name`='bit_p_stickies_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_stats_view_referer' WHERE `perm_name`='bit_p_view_referer_stats'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_stats_view' WHERE `perm_name`='bit_p_view_stats'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_edit_html_style' WHERE `perm_name`='bit_p_edit_html_style'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_post_comments' WHERE `perm_name`='bit_p_post_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_read_comments' WHERE `perm_name`='bit_p_read_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_remove_comments' WHERE `perm_name`='bit_p_remove_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_vote_comments' WHERE `perm_name`='bit_p_vote_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_edit_comments' WHERE `perm_name`='bit_p_edit_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_attach_attachments' WHERE `perm_name`='bit_p_content_attachments'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_detach_attachment' WHERE `perm_name`='bit_p_detach_attachment'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_liberty_print' WHERE `perm_name`='bit_p_print'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_edit' WHERE `perm_name`='bit_p_edit_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_remove' WHERE `perm_name`='bit_p_remove_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_read' WHERE `perm_name`='bit_p_read_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_submit' WHERE `perm_name`='bit_p_submit_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_edit_submission' WHERE `perm_name`='bit_p_edit_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_remove_submission' WHERE `perm_name`='bit_p_remove_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_approve_submission' WHERE `perm_name`='bit_p_approve_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_send' WHERE `perm_name`='bit_p_send_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_sendme' WHERE `perm_name`='bit_p_sendme_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_auto_approve' WHERE `perm_name`='bit_p_autoapprove_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_articles_admin' WHERE `perm_name`='bit_p_admin_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_nexus_insert_item' WHERE `perm_name`='bit_p_insert_nexus_item'",
-		"UPDATE `".BIT_DB_PREFIX."users_permissions` SET `perm_name`='p_nexus_create_menus' WHERE `perm_name`='bit_p_create_nexus_menus'",
-
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_shoutbox_view' WHERE `perm_name`='bit_p_view_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_shoutbox_admin' WHERE `perm_name`='bit_p_admin_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_shoutbox_post' WHERE `perm_name`='bit_p_post_shoutbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_xmlrpc_send_content' WHERE `perm_name`='bit_p_send_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_xmlrpc_sendme_content' WHERE `perm_name`='bit_p_sendme_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_xmlrpc_admin_content' WHERE `perm_name`='bit_p_admin_received_pages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_admin' WHERE `perm_name`='bit_p_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_access_closed_site' WHERE `perm_name`='bit_p_access_closed_site'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_gatekeeper_create' WHERE `perm_name`='bit_p_create_gatekeeper'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_gatekeeper_edit' WHERE `perm_name`='bit_p_gatekeeper_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_gatekeeper_admin' WHERE `perm_name`='bit_p_gatekeeper_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_gatekeeper_read' WHERE `perm_name`='bit_p_read_gatekeeper'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_calendar_view' WHERE `perm_name`='bit_p_view_calendar'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_sample_admin' WHERE `perm_name`='bit_p_admin_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_sample_create' WHERE `perm_name`='bit_p_create_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_sample_edit' WHERE `perm_name`='bit_p_edit_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_sample_read' WHERE `perm_name`='bit_p_read_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_sample_remove' WHERE `perm_name`='bit_p_remove_sample'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_categories_admin' WHERE `perm_name`='bit_p_admin_categories'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_categories_view' WHERE `perm_name`='bit_p_view_categories'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_admin_banning' WHERE `perm_name`='bit_p_admin_banning'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_upload_userfiles' WHERE `perm_name`='bit_p_userfiles'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_create_bookmarks' WHERE `perm_name`='bit_p_create_bookmarks'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_cache_bookmarks' WHERE `perm_name`='bit_p_cache_bookmarks'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_configure_modules' WHERE `perm_name`='bit_p_configure_modules'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_use_usermenu' WHERE `perm_name`='bit_p_usermenu'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_use_tasks' WHERE `perm_name`='bit_p_tasks'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_custom_home_theme' WHERE `perm_name`='bit_p_custom_home_theme'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_custom_home_layout' WHERE `perm_name`='bit_p_custom_home_layout'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_use_custom_css' WHERE `perm_name`='bit_p_custom_css'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_tidbits_edit_fortune_cookies' WHERE `perm_name`='bit_p_edit_cookies'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_quota_create' WHERE `perm_name`='bit_p_create_quota'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_quota_edit' WHERE `perm_name`='bit_p_quota_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_quota_admin' WHERE `perm_name`='bit_p_quota_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_quota_read' WHERE `perm_name`='bit_p_read_quota'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_smileys_use' WHERE `perm_name`='bit_p_use_smileys'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_chatterbox_use' WHERE `perm_name`='bit_p_use_chatterbox'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_view' WHERE `perm_name`='bit_p_view_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_create' WHERE `perm_name`='bit_p_create_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_edit' WHERE `perm_name`='bit_p_edit_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_upload' WHERE `perm_name`='bit_p_upload_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_admin' WHERE `perm_name`='bit_p_admin_fisheye'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_fisheye_upload_nonimages' WHERE `perm_name`='bit_p_fisheye_upload_nonimages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_languages_create' WHERE `perm_name`='bit_p_create_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_languages_edit' WHERE `perm_name`='bit_p_edit_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_languages_delete' WHERE `perm_name`='bit_p_delete_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_languages_edit_master' WHERE `perm_name`='bit_p_edit_master_strings'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_languages_import' WHERE `perm_name`='bit_p_import_languages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_assign_group_perms' WHERE `perm_name`='bit_p_user_group_perms'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_assign_group_members' WHERE `perm_name`='bit_p_user_group_members'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_group_subgroups' WHERE `perm_name`='bit_p_user_group_subgroups'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_admin' WHERE `perm_name`='bit_p_admin_users'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_view_icons_and_tools' WHERE `perm_name`='bit_p_view_tabs_and_tools'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_create_personal_groups' WHERE `perm_name`='bit_p_create_personal_groups'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_view_user_list' WHERE `perm_name`='bit_p_view_user_list'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_view_user_homepage' WHERE `perm_name`='bit_p_view_user_homepage'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_users_edit_user_homepage' WHERE `perm_name`='bit_p_edit_user_homepage'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_galaxia_admin' WHERE `perm_name`='bit_p_admin_workflow'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_galaxia_abort_instance' WHERE `perm_name`='bit_p_abort_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_galaxia_use' WHERE `perm_name`='bit_p_use_workflow'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_galaxia_exception_instance' WHERE `perm_name`='bit_p_exception_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_galaxia_send_instance' WHERE `perm_name`='bit_p_send_instance'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_newsletters_admin' WHERE `perm_name`='bit_p_admin_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_newsletters_create' WHERE `perm_name`='bit_p_create_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_newsletters_create_editions' WHERE `perm_name`='bit_p_create_editions'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_newsletters_subscribe' WHERE `perm_name`='bit_p_subscribe_newsletters'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_newsletters_subscribe_email' WHERE `perm_name`='bit_p_subscribe_email'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_blogs_create' WHERE `perm_name`='bit_p_create_blogs'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_blogs_create_public_blog' WHERE `perm_name`='bit_p_create_public_blog'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_blogs_post' WHERE `perm_name`='bit_p_blog_post'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_blogs_admin' WHERE `perm_name`='bit_p_blog_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_blogs_view' WHERE `perm_name`='bit_p_read_blog'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_pdf_generation' WHERE `perm_name`='bit_p_pdf_generation'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_messages_send' WHERE `perm_name`='bit_p_messages'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_edit_dynvar' WHERE `perm_name`='bit_p_edit_dynvar'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_edit_page' WHERE `perm_name`='bit_p_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_view_page' WHERE `perm_name`='bit_p_view'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_remove_page' WHERE `perm_name`='bit_p_remove'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_rollback' WHERE `perm_name`='bit_p_rollback'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_admin' WHERE `perm_name`='bit_p_admin_wiki'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_save_minor' WHERE `perm_name`='bit_p_minor'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_rename_page' WHERE `perm_name`='bit_p_rename'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_lock_page' WHERE `perm_name`='bit_p_lock'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_edit_book' WHERE `perm_name`='bit_p_edit_books'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_admin_book' WHERE `perm_name`='bit_p_admin_books'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_wiki_edit_copyright' WHERE `perm_name`='bit_p_edit_copyrights'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_pigeonholes_view' WHERE `perm_name`='bit_p_view_pigeonholes'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_pigeonholes_insert_member' WHERE `perm_name`='bit_p_insert_pigeonhole_member'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_pigeonholes_edit' WHERE `perm_name`='bit_p_edit_pigeonholes'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_stickies_edit' WHERE `perm_name`='bit_p_stickies_edit'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_stickies_admin' WHERE `perm_name`='bit_p_stickies_admin'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_stats_view_referer' WHERE `perm_name`='bit_p_view_referer_stats'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_stats_view' WHERE `perm_name`='bit_p_view_stats'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_edit_html_style' WHERE `perm_name`='bit_p_edit_html_style'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_post_comments' WHERE `perm_name`='bit_p_post_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_read_comments' WHERE `perm_name`='bit_p_read_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_remove_comments' WHERE `perm_name`='bit_p_remove_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_vote_comments' WHERE `perm_name`='bit_p_vote_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_edit_comments' WHERE `perm_name`='bit_p_edit_comments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_attach_attachments' WHERE `perm_name`='bit_p_content_attachments'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_detach_attachment' WHERE `perm_name`='bit_p_detach_attachment'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_liberty_print' WHERE `perm_name`='bit_p_print'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_edit' WHERE `perm_name`='bit_p_edit_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_remove' WHERE `perm_name`='bit_p_remove_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_read' WHERE `perm_name`='bit_p_read_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_submit' WHERE `perm_name`='bit_p_submit_article'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_edit_submission' WHERE `perm_name`='bit_p_edit_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_remove_submission' WHERE `perm_name`='bit_p_remove_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_approve_submission' WHERE `perm_name`='bit_p_approve_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_send' WHERE `perm_name`='bit_p_send_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_sendme' WHERE `perm_name`='bit_p_sendme_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_auto_approve' WHERE `perm_name`='bit_p_autoapprove_submission'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_articles_admin' WHERE `perm_name`='bit_p_admin_articles'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_nexus_insert_item' WHERE `perm_name`='bit_p_insert_nexus_item'",
-		"UPDATE `".BIT_DB_PREFIX."users_group_permissions` SET `perm_name`='p_nexus_create_menus' WHERE `perm_name`='bit_p_create_nexus_menus'",
-	],
-], ],
-
-[ 'DATADICT' => [
-	['ALTER' => [
-		'users_users' => [
-			'provpass_expires' => [ '`provpass_expires`', 'I8' ],
-		],
-		'users_groups' => [
-			'is_public' => '`is_public` C(1)'  ,
-			'after_registration_page' => '`after_registration_page` C(255)' ,
-		],
-		'users_cnxn' => [
-			'assume_user_id' => [ '`assume_user_id`', 'I4' ],
-		],
-	]],
-	],
-],
-
-], ],
-];
-
-if( isset( $upgrades[$gUpgradeFrom][$gUpgradeTo] ) ) {
-	$gBitSystem->registerUpgrade( USERS_PKG_NAME, $upgrades[$gUpgradeFrom][$gUpgradeTo] );
-}
-
-?>
diff --git a/includes/classes/RolePermUser.php b/includes/classes/RolePermUser.php
index ddee217..f9249ed 100755
--- a/includes/classes/RolePermUser.php
+++ b/includes/classes/RolePermUser.php
@@ -36,7 +36,6 @@ use Bitweaver\Liberty\LibertyContent;
 class RolePermUser extends RoleUser {
 
 	public $mPerms;
-	public $mGroups;
 	public $mPermsOverride;
 
 	/**
@@ -232,9 +231,6 @@ class RolePermUser extends RoleUser {
 		return true;
 	}
 
-	public function isInGroup( $pGroupMixed ) { return false; }
-	public function groupExists( $pGroupMixed ) { return false; }
-
 	// =-=-=-=-=-=-=-=-=-=-=-= Role Functions =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 	/**
 	 * loadRoles load roles into $this->mRoles
@@ -248,12 +244,6 @@ class RolePermUser extends RoleUser {
 			$this->mRoles = $this->getRoles( 0, $pForceRefresh );
 		}
 	}
-	function loadGroups( $pForceRefresh = false ) {
-		if( $this->isValid() ) {
-			$this->mRoles = $this->getRoles( 0, $pForceRefresh );
-		}
-	}
-
 	/**
 	 * isInRole work out if a given user is assigned to a role
 	 * 
@@ -361,13 +351,6 @@ class RolePermUser extends RoleUser {
 		return $this->mDb->getAssoc( $sql, [ $pUserId ] );
 	}
 
-	public function getAllGroups( &$pListHash ) {
-		return [];
-	}
-
-	function getAllUserGroups( $pUserId = null ) {
-		return [];
-	}
 	/**
 	 * expungeRole remove a role
 	 * 
@@ -432,9 +415,6 @@ class RolePermUser extends RoleUser {
 	 * @access public
 	 * @return bool true on success, false on failure - mErrors will contain reason for failure
 	 */
-	public function getGroupHome( $pRoleId ) {
-		return $this->getRoleHome( $pRoleId );
-	}
 	public function getRoleHome( $pRoleId ) {
 		$ret = false;
 		if( BitBase::verifyId( $pRoleId )) {
@@ -765,10 +745,6 @@ class RolePermUser extends RoleUser {
 
 	}
 
-	public function getGroupPermissions( $pParamHash = null ) {
-		$this->getRolePermissions( $pParamHash );
-	}
-
 	/**
 	 * getRolePermissions
 	 * 
diff --git a/includes/classes/RoleUser.php b/includes/classes/RoleUser.php
index b190311..98537ed 100755
--- a/includes/classes/RoleUser.php
+++ b/includes/classes/RoleUser.php
@@ -1262,11 +1262,10 @@ class RoleUser extends \Bitweaver\Liberty\LibertyMime {
 			// default to general post-login
 			// @see \Bitweaver\BitSystem::getIndexPage
 			$indexType = 'my_page';
-			// getGroupHome is BitPermUser method
-			if( method_exists( $this, 'getGroupHome' ) &&
-				(( @$this->verifyId( $this->mInfo['default_group_id'] ) && ( $group_home = $this->getGroupHome( $this->mInfo['default_group_id'] ) ) ) ||
-				( $gBitSystem->getConfig( 'default_home_group' ) && ( $group_home = $this->getGroupHome( $gBitSystem->getConfig( 'default_home_group' ) ) ) )) ){
-				$indexType = 'group_home';
+			if( method_exists( $this, 'getRoleHome' ) &&
+				(( @$this->verifyId( $this->mInfo['default_role_id'] ) && ( $role_home = $this->getRoleHome( $this->mInfo['default_role_id'] ) ) ) ||
+				( $gBitSystem->getConfig( 'default_home_role' ) && ( $role_home = $this->getRoleHome( $gBitSystem->getConfig( 'default_home_role' ) ) ) )) ){
+				$indexType = 'role_home';
 			}
 
 			$url = $_SESSION['loginfrom'] ?? $gBitSystem->getIndexPage( $indexType );
diff --git a/register.php b/register.php
index eb20ca4..2e7912e 100755
--- a/register.php
+++ b/register.php
@@ -92,12 +92,6 @@ closedir( $h );
 sort( $flags );
 $gBitSmarty->assign('flags', $flags);
 
-$listHash = [
-	'is_public' => 'y',
-	'sort_mode' => [ 'is_default_asc', 'group_desc_asc' ],
-];
-$groupList = $gBitUser->getAllGroups( $listHash );
-$gBitSmarty->assign( 'groupList', $groupList );
 
 // include preferences settings from other packages - these will be included as individual tabs
 $packages = [];
diff --git a/templates/admin_assign_user.tpl b/templates/admin_assign_user.tpl
deleted file mode 100755
index 1bb37bb..0000000
--- a/templates/admin_assign_user.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{* $Header$ *}
-{strip}
-<div class="floaticon">{bithelp}</div>
-<div class="floaticon"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php">{booticon iname="fa-arrow-left" iexplain="back to users"}</a></div>
-
-<div class="admin users">
-	<div class="header">
-		<h1>{tr}Assign user to groups{/tr}</h1>
-		<p>{tr}Assign and remove groups for user {$assignUser->mInfo.login}{/tr}</p>
-	</div>
-
-	<div class="body">
-		<div class="row">
-			<div class="col-xs-12 col-sm-6">
-				{form legend="User Information" action="`$smarty.const.USERS_PKG_URL`admin/assign_user.php"}
-					<input type="hidden" value="{$assignUser->mUserId}" name="assign_user" />
-
-					<div class="form-group">
-						{formlabel label="Username"}
-						{forminput}
-							{$assignUser->getDisplayName(true)}
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="Email"}
-						{forminput}
-							{$assignUser->mInfo.email}
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="User ID"}
-						{forminput}
-							{$assignUser->mUserId}
-						{/forminput}
-					</div>
-
-					{if $gBitSystem->isPackageActive('quota')}
-					<div class="form-group">
-						{formlabel label="Quota"}
-						{forminput}
-							{$usage} / {$quota}MB ( {$quotaPercent}% )
-						{/forminput}
-					</div>
-					{/if}
-
-					<div class="form-group">
-						{formlabel label="Groups"}
-						{forminput}
-							<ul>
-							{foreach from=$assignUser->mGroups key=groupId item=group}
-								{if $groupId eq $assignUser->mInfo.default_group_id}<strong>{/if}
-								{if $groupId eq $assignUser->mInfo.default_group_id}</strong>{/if}
-								{if $groupId != -1}
-									&nbsp;<a class="btn btn-xs btn-danger" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}&amp;tk={$gBitUser->mTicket}">{booticon iname="fa-trash" iexplain="remove from group"}</a>
-								{/if}
-								<a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$groupId}">{$group.group_name}</a>
-								<br />
-							{/foreach}
-							</li>
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="Default Group" for="default_group"}
-						{forminput}
-							<select name="default_group" id="default_group">
-								{foreach from=$assignUser->mGroups key=groupId item=group}
-									<option value="{$groupId}" {if $groupId eq $assignUser->mInfo.default_group_id}selected="selected"{/if}>{$group.group_name}</option>
-								{/foreach}
-							</select>
-						{/forminput}
-					</div>
-
-					<div class="form-group submit">
-						<input type="submit" class="btn btn-default" value="{tr}set{/tr}" name="set_default" />
-					</div>
-				{/form}
-			</div>
-			<div class="col-xs-12 col-sm-6">
-				{legend legend="Add User to Group"}
-				<dl  class="">
-					{cycle values="even,odd" print=false}
-					{foreach from=$groups key=groupId item=group}
-						
-						{if !$assignUser->mGroups.$groupId && $groupId != -1}
-							<dt class="">
-									<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group_id={$groupId}&amp;assign_user={$assignUser->mUserId}&amp;{tk}" class="btn btn-xs btn-default mr-1">{booticon iname="fa-key" iexplain="assign"}</a>
-								{$group.group_name|escape}
-							</dt>
-							<dd class="ml-3 pb-1">
-		{$group.group_desc|escape}</dd>
-						{/if}
-					{/foreach}
-				</dl>
-				{/legend}
-			</div>
-		</div>
-	</div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/admin_group_edit.tpl b/templates/admin_group_edit.tpl
deleted file mode 100755
index 45f8593..0000000
--- a/templates/admin_group_edit.tpl
+++ /dev/null
@@ -1,128 +0,0 @@
-{* $Header$ *}
-{strip}
-
-<div class="floaticon">
-	<a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">
-		{booticon iname="fa-users" iexplain="Group List"}
-	</a>
-	{bithelp}
-</div>
-
-<div class="admin groups">
-	<div class="header">
-		<h1>{if $groupInfo.group_name}{tr}Administer Group{/tr}: {$groupInfo.group_name}{else}{tr}Create New Group{/tr}{/if}</h1>
-	</div>
-
-	<div class="body">
-		{formfeedback success=$successMsg error=$errorMsg}
-
-		{jstabs}
-			{jstab title="Edit Group"}
-				{form legend="Add or Edit a Group"}
-					<input type="hidden" name="group_id" value="{$groupInfo.group_id}" />
-					<div class="form-group">
-						{formlabel label="Group" for="groups_group"}
-						{forminput}
-							<input type="text" class="form-control" name="name" id="groups_group" size="30" maxlength="30" value="{$groupInfo.group_name}" />
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="Description" for="group_desc"}
-						{forminput}
-							<textarea rows="5" class="form-control" name="desc" id="group_desc">{$groupInfo.group_desc}</textarea>
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="Group home page" for="group_home"}
-						{forminput}
-							<input type="text" class="form-control" name="home" id="group_home" value="{$groupInfo.group_home|escape}" />
-							{formhelp note="Here you can enter the content id of any page, the wiki page name or the absolute path of any page you wish to use as a group home page. For this to work set the site homepage to <strong>Group Home</strong>" link="kernel/admin/index.php?page=features/General Settings"}
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{formlabel label="After registration page" for="after_registration_page"}
-						{forminput}
-							<input type="text" class="form-control" name="after_registration_page" id="after_registration_page" value="{$groupInfo.after_registration_page|escape}" />
-							{formhelp note="The same format than the Group home page. Used to redirect a user after his registration if other that the default after login page."}
-						{/forminput}
-					</div>
-
-					<div class="form-group">
-						{forminput label="checkbox"}
-							<input type="checkbox" id="default_home" name="default_home_group" {if $groupInfo.group_id eq $defaultGroupId}checked="checked"{/if} value="y" />Default home page
-							{formhelp note="This is the home page if a user belongs to many groups. Only one group may be the default home. If none is selected, users/my.php is the default."}
-						{/forminput}
-
-						{forminput label="checkbox"}
-							<input type="checkbox" name="is_default" value="y" {if $groupInfo.is_default eq 'y'}checked="checked"{/if} id="is_default" />Auto members
-							{formhelp note="Users are automatically added to this group when registering at your site."}
-						{/forminput}
-
-						{forminput label="checkbox"}
-							<input type="checkbox" name="is_public" value="y" {if $groupInfo.is_public eq 'y'}checked="checked"{/if} id="is_public" />Is public
-							{formhelp note="A user will be able to select this group at registration."}
-						{/forminput}
-					</div>
-
-					<div class="form-group submit">
-						<input type="submit" class="btn btn-default" name="cancel" value="{tr}Cancel{/tr}" />&nbsp;
-						{if $groupInfo.group_name}<input type="submit" class="btn btn-default" name="delete" value="{tr}Delete Group{/tr}" />&nbsp;{/if}
-						<input type="submit" class="btn btn-default" name="save" value="{tr}Save Group{/tr}" />
-					</div>
-				{/form}
-			{/jstab}
-
-			{if $groupInfo.group_id}
-				{jstab title="Assign Permissions"}
-					{form legend="Assign permissions"}
-						<input type="hidden" name="group_id" value="{$groupInfo.group_id}" />
-						<input type="hidden" name="package" value="{$smarty.request.package|escape}" />
-						<input type="hidden" name="perm_name[{$perms[user].perm_name}]" />
-
-						<div class="form-group">
-							{formlabel label="Display permissions of package"}
-							{forminput}
-								{smartlink ititle="All packages" group_id=$groupInfo.group_id}
-								{foreach from=$permPackages key=i item=packageKey}
-									{if $gBitSystem->isPackageActive($packageKey)}
-										&nbsp;&bull; {smartlink ititle=$gBitSystem->mPackages.$packageKey.name|default:$packageKey group_id=$groupInfo.group_id package=$packageKey}
-									{/if}
-								{/foreach}
-							{/forminput}
-						</div>
-
-						<div class="form-group">
-							<table class="table data table-hover">
-								<tr>
-									<th>&nbsp;</th>
-									<th>{smartlink ititle="Name" isort="up.perm_name" group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
-									<th>{smartlink ititle="Package" isort=package group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
-									<th>{smartlink ititle="User Class" isort=perm_level group_id=$groupInfo.level offset=$offset package=$smarty.request.level}</th>
-									<th>{smartlink ititle="Description" isort="up.perm_desc" group_id=$groupInfo.group_id offset=$offset package=$smarty.request.package}</th>
-								</tr>
-								{foreach key=permName item=perm from=$allPerms}
-									<tr class="{cycle values="even,odd"}">
-										<td><input type="checkbox" id="{$permName}" name="perm[{$permName}]" {if $groupInfo.perms.$permName} checked="checked"{/if} /></td>
-										<td><label for="{$permName}">{$permName}</label></td>
-										<td>{tr}{$perm.package}{/tr}</td>
-										<td>{tr}{$perm.perm_level}{/tr}</td>
-										<td>{tr}{$perm.perm_desc}{/tr}</td>
-									</tr>
-								{/foreach}
-							</table>
-						</div>
-
-						<div class="form-group submit">
-							<input type="submit" class="btn btn-default" name="updateperms" value="{tr}Update{/tr}" />
-						</div>
-					{/form}
-				{/jstab}
-			{/if}
-		{/jstabs}
-	</div><!-- end .body -->
-</div><!-- end .users -->
-
-{/strip}
diff --git a/templates/admin_groups_list.tpl b/templates/admin_groups_list.tpl
deleted file mode 100755
index bf1e3f3..0000000
--- a/templates/admin_groups_list.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-{strip}
-<div class="listing users">
-	<div class="header">
-		<a class="btn btn-primary btn-xs pull-right" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?action=create">{booticon iname="fa-user-group"} {tr}Add a new group{/tr}</a>
-		<h1>{tr}List of existing groups{/tr}</h1>
-	</div>
-
-	<div class="body">
-
-		{formfeedback success=$successMsg error=$errorMsg}
-
-		<ul class="list-inline navbar">
-			<li>{smartlink ititle="Name" isort="group_name" offset=$offset idefault=1}</li>
-			<li>{smartlink ititle="Description" isort="group_desc" offset=$offset}</li>
-			<li>{smartlink ititle="Home Page" isort="group_home" offset=$offset}</li>
-		</ul>
-
-		<ul class="clear data">
-			{foreach from=$groupList key=groupId item=grp}
-				<li class="item {cycle values='odd,even'}">
-					<div class="floaticon">
-						{smartlink ititle="Edit" ipackage="users" ifile="admin/edit_group.php" booticon="fa-pencil" group_id=$groupId}
-						{smartlink ititle="Group Members" ipackage="users" ifile="admin/edit_group.php" booticon="fa-group" members=$groupId}
-						{if $groupId ne $smarty.const.ANONYMOUS_GROUP_ID}
-							{smartlink ititle="Batch assign" ipackage="users" ifile="admin/edit_group.php" booticon="fa-gears" batch_assign=$groupId}
-						{/if}
-					</div>
-
-					<h2>{$grp.group_name}</h2>
-					<div style="float:left;width:30%;">
-						{$grp.group_desc}<br />
-						{if $grp.is_default eq 'y'}<small class="warning">*{tr}Default group{/tr}*</small><br/>{/if}
-						{if $grp.group_home}{tr}Home Page{/tr}:<strong> {$grp.group_home}</strong><br />{/if}
-					</div>
-
-					<div style="float:right;width:70%;">
-						{tr}Permissions{/tr}
-						<ul class="small">
-							{foreach from=$grp.perms key=permName item=perm}
-								<li>{$perm.perm_desc}</li>
-							{foreachelse}
-								<li>{tr}none{/tr}</li>
-							{/foreach}
-						</ul>
-					</div>
-					<div class="clear"></div>
-				</li>
-			{/foreach}
-		</ul>
-		{pagination}
-	</div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/admin_list_users.tpl b/templates/admin_list_users.tpl
index b255924..c17297f 100755
--- a/templates/admin_list_users.tpl
+++ b/templates/admin_list_users.tpl
@@ -70,25 +70,14 @@
 					</div>
 
 					<div class="form-group">
-						{if $gBitSystem->isPackageActive('protector')}
-							{if $defaultRoleId eq ''}
-								{formfeedback error="No default role is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_role.php\">Roles and Permissions</a> page"}
-							{/if}
-							{formlabel label="User will be added to the following role" for=""}
-							{forminput}
-								{$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a>
-								{formhelp note="This is the role that is selected as the default role. If you would like to change the default role, please click on the edit icon and set a different role as default role."}
-							{/forminput}
-						{else}
-							{if $defaultGroupId eq ''}
-								{formfeedback error="No default group is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_group.php\">Groups and Permissions</a> page"}
-							{/if}
-							{formlabel label="User will be added to the following group" for=""}
-							{forminput}
-								{$defaultGroupName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php?group_id={$defaultGroupId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a>
-								{formhelp note="This is the group that is selected as the default group. If you would like to change the default group, please click on the edit icon and set a different group as default group."}
-							{/forminput}
-						{/if}
+						{if $defaultRoleId eq ''}
+						{formfeedback error="No default role is currently set. Please set one in the Administration --&gt; Users --&gt; <a href=\"`$smarty.const.USERS_PKG_URL`admin/edit_role.php\">Roles and Permissions</a> page"}
+					{/if}
+					{formlabel label="User will be added to the following role" for=""}
+					{forminput}
+						{$defaultRoleName} <a href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php?role_id={$defaultRoleId}">{booticon iname="fa-pen-to-square" iexplain="change settings"}</a>
+						{formhelp note="This is the role that is selected as the default role. If you would like to change the default role, please click on the edit icon and set a different role as default role."}
+					{/forminput}
 					</div>
 
 					<div class="form-group">
@@ -120,11 +109,7 @@
 					{*include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"*}
 
 					<div class="form-group submit">
-						{if $gBitSystem->isPackageActive('protector')}
-							<input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} />
-						{else}
-							<input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultGroupId eq ''} disabled="disabled"{/if} />
-						{/if}	
+						<input type="submit" class="btn btn-default" name="newuser" value="{tr}Add User{/tr}"{if $defaultRoleId eq ''} disabled="disabled"{/if} />
 					</div>
 				{/form}
 			{/jstab}
diff --git a/templates/admin_login.tpl b/templates/admin_login.tpl
index 51c42e4..28403d9 100644
--- a/templates/admin_login.tpl
+++ b/templates/admin_login.tpl
@@ -66,33 +66,18 @@
 		</div>
 
 		<div class="form-group">
-			{if $roleList }
-				{formlabel label="Roles choice at registration" for="registration_role_choice"}
-				{forminput}
-					<select class="form-control" name="registration_role_choice[]" multiple="multiple" size="5">
-						<option value="">&nbsp;</option>
-						{foreach key=r item=ro from=$roleList}
-							{if $ro.role_id ne -1}
-								<option value="{$ro.role_id}" {if $ro.is_public eq 'y'} selected="selected"{/if}>{$ro.role_name|truncate:"52":" ..."}</option>
-							{/if}
-						{/foreach}
-					</select>
-					{formhelp note="A user will be able to select one of the selected roles at registration. If you select the default role (Registered), he will not be obliged to select a role."}
-				{/forminput}
-			{else}
-				{formlabel label="Groups choice at registration" for="registration_group_choice"}
-				{forminput}
-					<select class="form-control" name="registration_group_choice[]" multiple="multiple" size="5">
-						<option value="">&nbsp;</option>
-						{foreach key=g item=gr from=$groupList}
-							{if $gr.group_id ne -1}
-								<option value="{$gr.group_id}" {if $gr.is_public eq 'y'} selected="selected"{/if}>{$gr.group_name|truncate:"52":" ..."}</option>
-							{/if}
-						{/foreach}
-					</select>
-					{formhelp note="A user will be able to select one of the selected group at registration. If you select the default group (Registered), he will not be obliged to select a group."}
-				{/forminput}
-			{/if}
+			{formlabel label="Roles choice at registration" for="registration_role_choice"}
+			{forminput}
+				<select class="form-control" name="registration_role_choice[]" multiple="multiple" size="5">
+					<option value="">&nbsp;</option>
+					{foreach key=r item=ro from=$roleList}
+						{if $ro.role_id ne -1}
+							<option value="{$ro.role_id}" {if $ro.is_public eq 'y'} selected="selected"{/if}>{$ro.role_name|truncate:"52":" ..."}</option>
+						{/if}
+					{/foreach}
+				</select>
+				{formhelp note="A user will be able to select one of the selected roles at registration. If you select the default role (Registered), he will not be obliged to select a role."}
+			{/forminput}
 		</div>
 	{/jstab}
 
diff --git a/templates/admin_permissions.tpl b/templates/admin_permissions.tpl
deleted file mode 100644
index 50d9b96..0000000
--- a/templates/admin_permissions.tpl
+++ /dev/null
@@ -1,114 +0,0 @@
-{strip}
-<div class="admin users">
-	<div class="header">
-		<h1>{tr}Assign Group Permissions{/tr}</h1>
-	</div>
-
-	<div class="body">
-		{formfeedback hash=$feedback}
-
-		{form}
-			<input type="hidden" name="package" value="{$smarty.request.package}" />
-
-			<p>
-				{smartlink ititle=All package=$packageKey}
-				{foreach from=$permPackages key=i item=packageKey}
-					{if $gBitSystem->isPackageActive($packageKey)}
-						&nbsp;&bull; {smartlink ititle=$gBitSystem->mPackages.$packageKey.name|default:$packageKey package=$packageKey}
-					{/if}
-				{/foreach}
-			</p>
-
-			<table class="table data">
-				<caption>{tr}Available Permissions{/tr}</caption>
-				{foreach from=$allPerms item=perm key=p name=perms}
-					{if $prev_package != $perm.package}
-						<tr>
-							<th class="width1p"></th>
-							<th>{tr}Permission{/tr} - {$perm.package}</th>
-							{foreach from=$allGroups item=group name=groups}
-								<th class="width10p"{if $group.group_id lt 4} colspan="2"{/if}>
-									<abbr title="{$group.group_name}">{if $smarty.foreach.groups.total > 8}{$group.group_id}{else}{$group.group_name}{/if}</abbr>
-								</th>
-							{/foreach}
-						</tr>
-						{assign var=prev_package value=$perm.package}
-					{/if}
-					<tr class="{cycle values="odd,even"}{if $unassignedPerms.$p} prio5{/if}">
-						<td>{if $unassignedPerms.$p}{booticon iname="fa-triangle-exclamation" iexplain="Unassigned Permission"}{/if}</td>
-						<td title="{$perm.perm_desc}"><abbr title="{$perm.perm_desc}">{$p}</abbr></td>
-						{foreach from=$allGroups item=group}
-							{if     $perm.perm_level == 'admin'     }{assign var=id value=1}
-							{elseif $perm.perm_level == 'editors'   }{assign var=id value=2}
-							{elseif $perm.perm_level == 'registered'}{assign var=id value=3}
-							{elseif $perm.perm_level == 'basic'     }{assign var=id value=-1}{/if}
-
-							{if $id == $group.group_id && !$group.perms.$p}
-								{assign var=class value="prio5"}
-							{elseif $id == $group.group_id && $group.perms.$p}
-								{assign var=class value="prio1"}
-							{elseif $id != $group.group_id && $group.perms.$p}
-								{assign var=class value="prio5"}
-							{else}
-								{assign var=class value=""}
-							{/if}
-
-							<td class="{if $group.group_id lt 4}alignright{else}content-center{/if} {$class}">
-								<input id="{$p}{$group.group_id}" type="checkbox" value="{$p}" name="perms[{$group.group_id}][{$p}]" title="{$group.group_name}" {if $group.perms.$p}checked="checked"{/if}/>
-							</td>
-
-							{if $group.group_id lt 4}
-								<td class="alignleft {$class} width5p">
-									{if $id == $group.group_id}<label for="{$p}{$group.group_id}">{booticon iname="fa-check" iexplain="Default"}</label>{/if}
-								</td>
-							{/if}
-						{/foreach}
-					</tr>
-				{/foreach}
-			</table>
-
-			<p class="formhelp">{tr}Default permissions set after installation are marked with:{/tr} {booticon iname="fa-check" iexplain="Default"}</p>
-
-			<div class="submit">
-				<input type="submit" class="btn btn-default" name="save" value="{tr}Apply Changes{/tr}" />
-			</div>
-		{/form}
-
-		{if $smarty.foreach.groups.total > 8}
-			<dl>
-				{foreach from=$allGroups item=group}
-					<dt>{$group.group_id}</dt>
-					<dd>{$group.group_name}: {$group.group_desc}</dd>
-				{/foreach}
-			</dl>
-		{/if}
-
-		{if $contentWithPermissions}
-			<h2>{tr}Content with individual Permissions{/tr}</h2>
-			<ul>
-				{foreach from=$contentWithPermissions item=content key=content_type_guid}
-					<li><em>{$gLibertySystem->getContentTypeName($content_type_guid)}</em>
-						<ul>
-							{foreach from=$content item=perms key=content_id}
-								<li><a href="{$smarty.const.LIBERTY_PKG_URL}content_permissions.php?content_id={$content_id}">{$perms.0.title}</a>
-									<ul>
-										{foreach from=$perms item=perm}
-											<li>
-												{$perm.group_name}: {if $perm.is_revoked}
-													{booticon iname="fa-circle-minus" iexplain="Removed Permission"}
-												{else}
-													{booticon iname="fa-circle-plus" iexplain="Added Permission"}
-												{/if} {$perm.perm_name}
-											</li>
-										{/foreach}
-									</ul>
-								</li>
-							{/foreach}
-						</ul>
-					</li>
-				{/foreach}
-			</ul>
-		{/if}
-	</div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/center_user_wiki_page.tpl b/templates/center_user_wiki_page.tpl
index ec2104b..5ac6e53 100644
--- a/templates/center_user_wiki_page.tpl
+++ b/templates/center_user_wiki_page.tpl
@@ -8,8 +8,7 @@
 					{smartlink ipackage=bitcommerce ifile="admin/list_orders.php" user_id=$userInfo.user_id ititle="Orders" booticon="fa-shopping-cart"}
 				{/if}
 				{smartlink ipackage=users ifile="admin/index.php" assume_user=$userInfo.user_id tk=$gBitUser->mTicket ititle="Assume user identity" booticon="fa-user-doctor"}
-				{smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userInfo.user_id ititle="Assign Group" booticon="fa-key"}
-				{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"}
+{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userInfo.user_id ititle="User Activity" booticon="fa-bolt"}
 				{if $userInfo.user_id != $smarty.const.ANONYMOUS_USER_ID}
 					{smartlink ipackage=liberty ifile="list_content.php" user_id=$userInfo.user_id ititle="User Content" booticon="fa-square-list"}
 					{smartlink ipackage=users ifile="admin/index.php" action=delete user_id=$userInfo.user_id ititle="Remove" booticon="fa-trash"}
diff --git a/templates/group_list_members.tpl b/templates/group_list_members.tpl
deleted file mode 100644
index eb25f06..0000000
--- a/templates/group_list_members.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{strip}
-<div class="floaticon">
-	<a href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">
-		{booticon iname="fa-group" iexplain="Group List"}
-	</a>
-	{bithelp}
-</div>
-
-<div class="listing users">
-	<div class="header">
-		<h1>{tr}Group Members{/tr}: {$groupInfo.group_name}</h1>
-	</div>
-
-	<div class="body">
-		{formfeedback success=$successMsg error=$errorMsg}
-
-		<table class="table">
-		<thead>
-			<tr>
-				<td class="text-right">#</td>
-				<td>{tr}Name{/tr}</td>
-				<td>{tr}Email{/tr}</td>
-				<td class="text-right">{tr}Registered{/tr}</td>
-				<td class="text-right">{tr}Last Login{/tr}</td>
-				<td></td>
-			</tr>
-		</thead>
-		<tbody>
-			{foreach from=$groupMembers key=userId item=member name=groupMembers}
-				<tr>
-					<td class="text-right">{$smarty.foreach.groupMembers.iteration}</td>
-					<td>{displayname hash=$member}</td>
-					<td>{$member.email}</td>
-					<td class="text-right">{$member.registration_date|bit_short_date}</td>
-					<td class="text-right">{$member.last_login|bit_short_date}</td>
-					<td>
-					{if $gBitSystem->isPackageActive('bitcommerce')} &nbsp;<a class="icon" href="{$smarty.const.BITCOMMERCE_PKG_URL}admin/list_orders.php?user_id={$userId}">{booticon iname="fa-shopping-cart"}</a>{/if}
-&nbsp;<a class="icon" href="{$smarty.const.LIBERTY_PKG_URL}list_content.php?user_id={$userId}{if $gBitSystem->isPackageActive('bitcommerce')}&amp;content_type_guid=bitproduct{/if}">{booticon iname="fa-square-list"}</a>
-&nbsp;<a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/user_activity.php?user_id={$userId}">{booticon iname="fa-bolt"}</a>
-					{if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $groupInfo.group_id != $smarty.const.ANONYMOUS_GROUP_ID}
-						&nbsp;<a class="icon" href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removegroup&amp;group_id={$groupInfo.group_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-remove-circle" iexplain="Remove From Group"}</a>
-					{/if}
-					</td>
-				</tr>
-			{foreachelse}
-				<tr>{tr}The group has no members.{/tr}</tr>
-			{/foreach}
-		</tbody>
-		</table>
-	</div><!-- end .body -->
-</div>
-{/strip}
diff --git a/templates/menu_users_admin.tpl b/templates/menu_users_admin.tpl
index f6e7a75..0ba0c95 100755
--- a/templates/menu_users_admin.tpl
+++ b/templates/menu_users_admin.tpl
@@ -9,12 +9,7 @@
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/?page=login">{tr}Login Options{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/user_activity.php">{tr}User Activity{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/users_import.php">{tr}Import Users{/tr}</a></li>
-		{if $gBitSystem->isPackageActive('protector')}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">{tr}Role &amp; Permissions{/tr}</a></li>
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/role_permissions.php">{tr}Permission Maintenance{/tr}</a></li>
-		{else}
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_group.php">{tr}Groups &amp; Permissions{/tr}</a></li>
-			<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/permissions.php">{tr}Permission Maintenance{/tr}</a></li>
-		{/if}
+		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/edit_role.php">{tr}Role &amp; Permissions{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.USERS_PKG_URL}admin/role_permissions.php">{tr}Permission Maintenance{/tr}</a></li>
 </ul>
 {/strip}
diff --git a/templates/my_groups_list.tpl b/templates/my_groups_list.tpl
deleted file mode 100644
index 65b6152..0000000
--- a/templates/my_groups_list.tpl
+++ /dev/null
@@ -1,132 +0,0 @@
-{strip}
-<div class="admin users">
-	<div class="header">
-		<h1>{tr}My Groups{/tr}</h1>
-	</div>
-
-	<div class="body">
-		{formfeedback success=$successMsg error=$errorMsg}
-
-		{jstabs}
-			{jstab title="My System Groups"}
-				<table class="table data">
-					<tr>
-						<th>{tr}My Groups{/tr}</th>
-						<th>{tr}Description{/tr}</th>
-						{if $canRemovePublic}
-							<th>{tr}Action{/tr}</th>
-						{/if}
-					</tr>
-					{foreach from=$systemGroups key=groupId item=group}
-						<tr class="{cycle values="odd,even"}">
-							<td>{$group.group_name}</td>
-							<td>{$group.group_desc}</td>
-							{if $canRemovePublic}
-								<td>
-									{if $group.public eq 'y'}
-										<a href="{$smarty.const.USERS_PKG_URL}my_groups.php?remove_public_group=y&amp;public_group_id={$groupId}" 
-											onclick="return confirm('{tr}Are you sure you want to leave this group?{/tr}')">{booticon iname="fa-scissors" iexplain="Leave Group"}</a>
-									{else}
-										&nbsp;
-									{/if}
-								</td>
-							{/if}
-						</tr>
-					{/foreach}
-				</table>
-
-				{if $canAddPublic}
-					<br />
-					<table class="table data">
-						<tr>
-							<th>{tr}Public Groups{/tr}</th>
-							<th>{tr}Description{/tr}</th>
-							<th>{tr}Action{/tr}</th>
-						</tr>
-						{foreach from=$publicGroups key=groupId item=group}
-							{if $group.used ne 'y' && $group.is_default ne 'y'}			
-								<tr class="{cycle values="odd,even"}">
-									<td>{$group.group_name}</td>
-									<td>{$group.group_desc}</td>
-									<td><a href="{$smarty.const.USERS_PKG_URL}my_groups.php?add_public_group=y&amp;public_group_id={$group.group_id}"  title="{tr}Assign Group{/tr}">{booticon iname="fa-key" iexplain="join group"}</a></td>								
-								</tr>
-							{/if}
-						{/foreach}
-					</table>
-				{/if}
-			{/jstab}
-				
-			{if $gBitUser->hasPermission( 'p_users_create_personal_groups' )}
-
-				{jstab title="My User Groups"}
-					<a href="{$smarty.const.USERS_PKG_URL}my_groups.php?action=create">{tr}Add new group{/tr}</a>
-
-					<table class="table data">
-						<tr>
-							<th>
-								<a href="{$smarty.const.USERS_PKG_URL}my_groups.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'group_name_desc'}group_name_asc{else}group_name_desc{/if}">{tr}Name{/tr}</a>, &amp; 
-								{tr}Description{/tr}</a> 
-							</th>
-							{if $gBitUser->hasPermission( 'p_users_assign_group_members' )}
-								<th>{tr}Members{/tr}</th>
-							{/if}
-							{if $gBitUser->hasPermission( 'p_users_assign_group_perms' )}
-								<th>{tr}Permissions{/tr}</th>
-							{/if}
-							<th>{tr}Action{/tr}</th>
-						</tr>
-
-						{foreach from=$groups key=groupId item=group}
-							<tr class="{cycle values="odd,even"}">
-								<td>
-									<strong>{$group.group_name}</strong>{if $group.is_default eq 'y'}<em class="warning"> *{tr}Default group{/tr}*</em>{/if}<br />
-									{$group.group_desc}<br />
-									{if $group.group_home}{tr}Home Page{/tr}:<strong> {$group.group_home}</strong><br />{/if}
-									{if $group.included}
-										{tr}Included Groups{/tr}
-										<ul>
-											{foreach from=$group.included key=incGroupId item=incGroupName}
-												<li>{$incGroupName}</li>
-											{/foreach}
-										</ul>
-									{/if}
-								</td>
-
-								{if $gBitUser->hasPermission( 'p_users_assign_group_members' )}
-									<td>
-										{foreach from=$groupUsers key=userId item=user}
-											&nbsp;{displayname hash=$user}<br />
-										{foreachelse}
-											<strong>{tr}none{/tr}</strong>
-										{/foreach}
-									</td>
-								{/if}
-
-								{if $gBitUser->hasPermission( 'p_users_assign_group_perms' )}
-									<td>
-										{foreach from=$group.perms key=permName item=perm}
-											&nbsp;{$perm.perm_desc}<br />
-										{foreachelse}
-											<strong>{tr}none{/tr}</strong>
-										{/foreach}
-									</td>
-								{/if}
-
-								<td class="actionicon">
-									<a href="{$smarty.const.USERS_PKG_URL}my_groups.php?group_id={$groupId}">{booticon iname="fa-pen-to-square" iexplain="edit"}</a>
-									{if $groupId ne ANONYMOUS_GROUP_ID}
-										<a href="{$smarty.const.USERS_PKG_URL}my_groups.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;action=delete&amp;group_id={$groupId}" 
-										onclick="return confirm('{tr}Are you sure you want to delete this group?{/tr}')">{booticon iname="fa-trash" iexplain="Delete Group"}</a>
-									{/if}
-								</td>
-							</tr>
-						{/foreach}
-					</table>
-
-					{pagination}
-				{/jstab}
-			{/if}
-		{/jstabs}
-	</div><!-- end .body -->
-</div><!-- end .users -->
-{/strip}
diff --git a/templates/register.tpl b/templates/register.tpl
index 75ee917..13b724c 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -199,25 +199,6 @@
 		</div>
 	{/foreach}
 
-	{if $groupList && count($groupList) > 1}
-		<hr />
-		{formlabel label="Group" for="group"}
-		{forminput}
-			{foreach item=gr from=$groupList name=group}
-				<input class="form-control" type="radio" name="group" value="{$gr.group_id|escape}"{if ($reg.group eq '' && $smarty.foreach.group.last) || $reg.group eq $gr.group_id} checked="checked"{/if}>
-					{if $gr.is_default eq "y"}
-						{tr}None{/tr}
-					{elseif $gr.group_desc}
-						{$gr.group_desc}
-					{else}
-						{$gr.group_name}
-					{/if}
-				</input>
-				{if !$smarty.foreach.group.last}<br />{/if}
-			{/foreach}
-			{formhelp note="Choose the group you belong to."}
-		{/forminput}
-	{/if}
 
 	{foreach item=package from=$packages}
 		{include file=$package.template }
diff --git a/templates/role_list_members.tpl b/templates/role_list_members.tpl
index 698da84..bb6810f 100644
--- a/templates/role_list_members.tpl
+++ b/templates/role_list_members.tpl
@@ -18,7 +18,7 @@
 			{foreach from=$roleMembers key=userId item=member}
 				<li>{displayname hash=$member}
 					{if $member.user_id != $smarty.const.ANONYMOUS_USER_ID && $roleInfo.role_id != $smarty.const.ANONYMOUS_TEAM_ID}
-						&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
+						&nbsp;<a href="{$smarty.const.USERS_PKG_URL}admin/assign_role_user.php?action=removerole&amp;role_id={$roleInfo.role_id}&amp;assign_user={$member.user_id}">{booticon iname="fa-trash" iexplain="remove from role"}</a>
 					{/if}
 				</li>
 			{foreachelse}
diff --git a/templates/users_list.tpl b/templates/users_list.tpl
index 85993e4..f1e79eb 100755
--- a/templates/users_list.tpl
+++ b/templates/users_list.tpl
@@ -82,12 +82,7 @@
 						{smartlink ipackage=liberty ifile="list_content.php" user_id=$userHash.user_id ititle="User Content" booticon="fa-list"}
 						{smartlink ipackage=users ifile="admin/index.php" assume_user=$userHash.user_id ititle="Assume User Identity" booticon="fa-user-doctor"}
 						{smartlink ipackage=users ifile="preferences.php" view_user=$userHash.user_id ititle="Edit User Information" booticon="fa-edit"}
-						{if $gBitSystem->isPackageActive('protector')}
-							{smartlink ipackage=users ifile="admin/assign_role_user.php" assign_user=$userHash.user_id ititle="Assign Group" booticon="fa-key"}
-						{else}
-							{smartlink ipackage=users ifile="admin/assign_user.php" assign_user=$userHash.user_id ititle="Assign Role" booticon="fa-key"}
-						{/if}
-						{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="fa-bolt"}
+{smartlink ipackage=users ifile="admin/user_activity.php" user_id=$userHash.user_id ititle="User Activity" booticon="fa-bolt"}
 						{if $userHash.user_id != $smarty.const.ANONYMOUS_USER_ID && $userHash.user_id != $smarty.const.ROOT_USER_ID && $userHash.user_id != $gBitUser->mUserId}
 							{if $userHash.content_status_id > 0}
 								{smartlink ipackage=users ifile="admin/index.php" user_id=$userHash.user_id action=ban ititle="Disable Account" booticon="fa-ban"}