diff --git a/db/mysql_template.sql b/db/mysql_template.sql
index 9b860c42..d63f5760 100644
--- a/db/mysql_template.sql
+++ b/db/mysql_template.sql
@@ -1418,6 +1418,28 @@ ALTER TABLE `ogp_widgets`
 --
 ALTER TABLE `ogp_ticket_messages`
   ADD CONSTRAINT `ogp_ticket_messages_fk0` FOREIGN KEY (`ticket_id`) REFERENCES `ogp_tickets` (`tid`);
+
+--
+-- Dumping data for consolidated modules
+--
+
+-- Dashboard widgets
+INSERT INTO `ogp_widgets` (`id`, `column_id`, `sort_no`, `collapsed`, `title`) VALUES 
+(1, 1, 1, 0, 'Game Monitor'),  
+(2, 2, 0, 0, 'Online Server'),  
+(3, 2, 1, 0, 'Currently Online'),  
+(4, 3, 0, 0, 'FTP'),
+(5, 3, 1, 0, 'Support');
+
+-- Ticket system default settings
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('ratings_enabled', 'true') ON DUPLICATE KEY UPDATE `setting_name` = 'ratings_enabled', `setting_value` = 'true';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('attachments_enabled', 'true') ON DUPLICATE KEY UPDATE `setting_name` = 'attachments_enabled', `setting_value` = 'true';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('attachment_max_size', '52428800') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_max_size', `setting_value` = '52428800';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('attachment_limit', '5') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_limit', `setting_value` = '5';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('attachment_save_dir', 'modules/tickets/uploads') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_save_dir', `setting_value` = 'modules/tickets/uploads';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('attachment_extensions', 'jpg, gif, jpeg, jpg, png, pdf, txt, sql, zip') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_extensions', `setting_value` = 'jpg, gif, jpeg, jpg, png, pdf, txt, sql, zip';
+INSERT INTO `ogp_ticket_settings` (setting_name, setting_value) VALUES ('notifications_enabled', 'true') ON DUPLICATE KEY UPDATE `setting_name` = 'notifications_enabled', `setting_value` = 'true';
+
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
diff --git a/modules/TS3Admin/module.php b/modules/TS3Admin/module.php
index 71a54893..b7e6a4f2 100755
--- a/modules/TS3Admin/module.php
+++ b/modules/TS3Admin/module.php
@@ -24,26 +24,9 @@
 
 // Module general information
 $module_title = "TS3Admin";
-$module_version = "0.2";
-$db_version = 2;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => '', 'name'=>'ts3admin', 'group'=>'user' ) );
-$install_queries = array();
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."ts3_homes`;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."ts3_homes`
-  (`ts3_id` int(50) NOT NULL auto_increment,
-  `rserver_id` int(50) NOT NULL,
-  `ip` varchar(20) NOT NULL,
-  `pwd` varchar(40) NOT NULL,
-  `vserver_id` int(50) NOT NULL,
-  `user_id` int(50) NOT NULL,
-  PRIMARY KEY (`ts3_id`),
-UNIQUE KEY user_id (user_id,vserver_id)) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-$install_queries[1] = array(
-"ALTER TABLE `".OGP_DB_PREFIX."ts3_homes` DROP INDEX `user_id` ,
- ADD UNIQUE `rserver_id` ( `rserver_id` , `vserver_id` , `user_id` );");
-$install_queries[2] = array(
-"ALTER TABLE `".OGP_DB_PREFIX."ts3_homes` ADD `port` int(11) DEFAULT '10011'"
-);
+
 ?>
diff --git a/modules/addonsmanager/module.php b/modules/addonsmanager/module.php
index c74c512a..619d1d4a 100755
--- a/modules/addonsmanager/module.php
+++ b/modules/addonsmanager/module.php
@@ -24,25 +24,9 @@
 
 // Module general information
 $module_title = "Addons Manager";
-$module_version = "1.2";
-$db_version = 2;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => 'addons_manager', 'name'=>'Addons Manager', 'group'=>'admin' ) );
 
-$install_queries = array();
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."addons`;",
-"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."addons 
- (addon_id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  name VARCHAR(80) NOT NULL,
-  url VARCHAR(200) NOT NULL,
-  path VARCHAR(80) NOT NULL,
-  addon_type VARCHAR(7) NOT NULL,
-  home_cfg_id VARCHAR(7) NOT NULL) ENGINE=MyISAM;");
-
-$install_queries[1] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."addons` ADD `post_script` longtext NOT NULL;");
-	
-$install_queries[2] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."addons` ADD `group_id` int(11) NULL;");
 ?>
diff --git a/modules/administration/module.php b/modules/administration/module.php
index f349f33b..d29a2832 100755
--- a/modules/administration/module.php
+++ b/modules/administration/module.php
@@ -24,30 +24,10 @@
 
 // Module general information
 $module_title = "Administration";
-$module_version = "1.1";
-$db_version = 1;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => 'watch_logger', 'name'=>'Watch Logger', 'group'=>'admin' ) );
-$install_queries = array();
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."adminExternalLinks`;",
-"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."adminExternalLinks
-(
-  link_id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  name VARCHAR(80) NOT NULL,
-  url VARCHAR(200) NOT NULL,
-  user_id VARCHAR(7) NOT NULL
-) ENGINE=MyISAM;");
 
-$install_queries[1] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."logger`;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."logger` 
-(
-  `log_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,  
-  `date` varchar(20) NOT NULL,
-  `user_id` int(11) NOT NULL,  
-  `ip` varchar(15) NOT NULL,
-  `message` varchar(250) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
 ?>
 
diff --git a/modules/billing/module.php b/modules/billing/module.php
index fd1fe7bc..022e64ed 100755
--- a/modules/billing/module.php
+++ b/modules/billing/module.php
@@ -24,8 +24,8 @@
 
 // Module general information
 $module_title = "billing";
-$module_version = "1";
-$db_version = 4;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = FALSE;
 $module_menus = array(
     array( 'subpage' => 'orders', 'name'=>'Orders', 'group'=>'user,admin' ),
@@ -34,103 +34,4 @@ $module_menus = array(
     array( 'subpage' => 'coupons', 'name'=>'Coupons', 'group'=>'admin' )
 );
 
-$install_queries = array();
-$install_queries[0] = array(
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."billing_services`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."billing_services` (
-	`service_id` int(11) NOT NULL auto_increment,
-	`home_cfg_id` int(11) NOT NULL,
-	`mod_cfg_id` int(11) NOT NULL,
-	`service_name` varchar(255) NOT NULL,
-	`remote_server_id` varchar(255) NOT NULL,
-	`slot_max_qty` int(11) NOT NULL,
-	`slot_min_qty` int(11) NOT NULL,
-	`price_daily` float(15,4) NOT NULL,
-	`price_monthly` float(15,4) NOT NULL,
-	`price_year` float(15,4) NOT NULL,
-	`description` varchar(1000) NOT NULL,
-	`img_url` varchar(255) NOT NULL,
-	`ftp` varchar(255) NOT NULL,
-	`install_method` varchar(255) NOT NULL,
-	`manual_url` varchar(255) NOT NULL, 
-	`access_rights` varchar(255) NOT NULL, 
-	PRIMARY KEY  (`service_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=UTF8;",
-	
-    "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."billing_orders`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."billing_orders` (
-	`order_id` int(11) NOT NULL auto_increment,	
-	`user_id` int(11) NOT NULL,
-	`service_id` int(11) NOT NULL,
-	`home_path` varchar(255) NOT NULL,
-	`home_name` varchar(255) NOT NULL,
-	`ip` varchar(255) NOT NULL,
-	`port` varchar(5) NOT NULL,
-	`qty` int(11) NOT NULL,
-	`invoice_duration` varchar(16) NOT NULL,
-	`max_players` int(11) NOT NULL,
-	`remote_control_password` varchar(10) NULL,
-	`ftp_password` varchar(10) NULL,
-	`subtotal` float(15,2) NOT NULL,
-	`rate` int(11) NOT NULL,
-	`total` float(15,2) NOT NULL,
-	`date` varchar(10) NULL,
-	PRIMARY KEY  (`order_id`)
-	) ENGINE=MyISAM;"
-);
-
-$install_queries[1] = array(
-    "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."billing_carts`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."billing_carts` (
-	`cart_id` int(11) NOT NULL auto_increment,
-	`user_id` int(11) NOT NULL,
-	`paid` int(11) NULL,
-	PRIMARY KEY  (`cart_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=UTF8;",
-	
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."billing_orders`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."billing_orders` (
-	`order_id` int(11) NOT NULL auto_increment,
-	`user_id` int(11) NOT NULL,
-	`service_id` int(11) NOT NULL,
-	`home_path` varchar(255) NOT NULL,
-	`home_name` varchar(255) NOT NULL,
-	`ip` varchar(255) NOT NULL,
-	`qty` int(11) NOT NULL,
-	`invoice_duration` varchar(16) NOT NULL,
-	`max_players` int(11) NOT NULL,
-	`price` float(15,2) NOT NULL,
-	`remote_control_password` varchar(10) NULL,
-	`ftp_password` varchar(10) NULL,
-	`paid` varchar(1) NULL,
-	`date` varchar(10) NULL,
-	`cart_id` int(11) NOT NULL,
-	PRIMARY KEY  (`order_id`)
-	) ENGINE=MyISAM;"
-);
-
-$install_queries[2] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` DROP `date`;",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` DROP `home_path`;",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` DROP `paid`;",
-    "ALTER TABLE `".OGP_DB_PREFIX."billing_orders` ADD `home_id` varchar(255) NOT NULL DEFAULT '0';",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` ADD `status` varchar(16) NOT NULL DEFAULT '0';",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_carts` ADD `date` varchar(16) NOT NULL DEFAULT '0';",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_carts` ADD `tax_amount` varchar(16) NOT NULL DEFAULT '0';",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_carts` ADD `currency` varchar(3) NOT NULL DEFAULT '0';"
-);
-
-$install_queries[3] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` ADD `finish_date` varchar(16) NOT NULL DEFAULT '0';"
-);
-
-$install_queries[4] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` ADD `extended` tinyint(1) NOT NULL;",
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_services` ADD `enabled` int(11) NOT NULL;"
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_carts` ADD `coupon_id` varchar(3) NOT NULL DEFAULT '0';"
-	"ALTER TABLE `".OGP_DB_PREFIX."billing_orders` ADD `coupon_id` varchar(3) NOT NULL DEFAULT '0';"
-
-);
-
-
 ?>
diff --git a/modules/circular/module.php b/modules/circular/module.php
index a6bd6f3d..508b8b1f 100755
--- a/modules/circular/module.php
+++ b/modules/circular/module.php
@@ -23,7 +23,7 @@
  */
 
 $module_title = "Circular";
-$module_version = "0.1";
+$module_version = "1.0";
 $db_version = 0;
 $module_required = false;
 $module_menus = array(
@@ -33,15 +33,7 @@ $module_menus = array(
 						'group'		=>	'admin',
 					)
 				);
-				
-$install_queries[0] = array(
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."circular`",
-	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."circular` (
-		`circular_id` int NOT NULL AUTO_INCREMENT,
-		`subject` TEXT NOT NULL,
-		`message` TEXT NOT NULL,
-		`timestamp` TIMESTAMP,
-		PRIMARY KEY (`circular_id`)
+
 	);",
 	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."circular_recipients`",
 	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."circular_recipients` (
diff --git a/modules/config_games/module.php b/modules/config_games/module.php
index 02f8e55b..4d736062 100755
--- a/modules/config_games/module.php
+++ b/modules/config_games/module.php
@@ -34,29 +34,4 @@ $module_menus = array(
 	array( 'subpage' => '', 'name'=>'Game/Mod Config', 'group'=>'admin' )
 	);
 
-$install_queries = array();
-
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."config_homes;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."config_homes` (
-  `home_cfg_id` int(20) NOT NULL auto_increment,
-  `game_key` varchar(64) NOT NULL,
-  `game_name` varchar(255) NOT NULL,
-  `home_cfg_file` varchar(64) NULL,
-  PRIMARY KEY  (`home_cfg_id`),
-  UNIQUE KEY `game_key` (`game_key`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1;",
-
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."config_mods;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."config_mods` (
-  `mod_cfg_id` int(50) NOT NULL auto_increment,
-  `home_cfg_id` varchar(50) NOT NULL,
-  `mod_key` varchar(100) NOT NULL COMMENT 'mod short name - used by the game server for startup commands - ex cstrike',
-  `mod_name` varchar(255) NOT NULL COMMENT 'Mod value is user defined string - like Counter-Strike',
-  `def_precmd` TEXT,
-  `def_postcmd` TEXT,
-  PRIMARY KEY  (`mod_cfg_id`),
-  UNIQUE KEY `home_cfg_id` (`home_cfg_id`,`mod_key`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
 ?>
diff --git a/modules/dashboard/module.php b/modules/dashboard/module.php
index 794fa14c..98c35399 100755
--- a/modules/dashboard/module.php
+++ b/modules/dashboard/module.php
@@ -28,33 +28,6 @@ $module_version = "1.0";
 $db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => 'dashboard', 'name'=>'Dashboard', 'group'=>'user' ) );
-$install_queries = array();
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."widgets;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."widgets` (  
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `column_id` int(11) NOT NULL,  
-  `sort_no` int(11) NOT NULL,  
-  `collapsed` tinyint(4) NOT NULL,
-  `title` varchar(100) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
 
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."widgets_users",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."widgets_users` (  
-  `user_id` int(11) NOT NULL,
-  `widget_id` int(11) NOT NULL,  
-  `column_id` int(11) NOT NULL,  
-  `sort_no` int(11) NOT NULL,  
-  `collapsed` tinyint(4) NOT NULL,  
-  `title` varchar(100) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-
-"INSERT INTO `".OGP_DB_PREFIX."widgets` (`id`, `column_id`, `sort_no`, `collapsed`, `title`) VALUES 
-(1, 1, 1, 0, 'Game Monitor'),  
-(2, 2, 0, 0, 'Online Server'),  
-(3, 2, 1, 0, 'Currently Online'),  
-(4, 3, 0, 0, 'FTP'),
-(5, 3, 1, 0, 'Support'); ");
 ?>
 
diff --git a/modules/fast_download/module.php b/modules/fast_download/module.php
index a71da780..1761f341 100755
--- a/modules/fast_download/module.php
+++ b/modules/fast_download/module.php
@@ -24,29 +24,13 @@
 
 // Module general information
 $module_title = "Fast Download";
-$module_version = "2.1";
-$db_version = 4;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => '', 'name'=>'Fast Download', 'group'=>'admin' ) );
 $module_access_rights = array('d' => 'allow_fast_download');
 
-$install_queries[0] = array("SELECT NOW();");
-$install_queries[1] = array("DROP TABLE IF EXISTS `".OGP_DB_PREFIX."fastdl`;");
-$install_queries[2] = array("SELECT NOW();");
-$install_queries[3] = array(
-	"CREATE TABLE ".OGP_DB_PREFIX."fastdl_access_rules (
-		`home_cfg_id` varchar(32) NOT NULL,
-		`match_file_extension` TEXT,
-		`match_client_ip` TEXT,
-		UNIQUE KEY (`home_cfg_id`)
-		) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-$install_queries[4] = array(
-	"CREATE TABLE ".OGP_DB_PREFIX."fastdl_settings (
-		`remote_server_id` int(11) NOT NULL,
-		`setting` varchar(63) NOT NULL,
-        `value` varchar(255) NOT NULL,
-		UNIQUE KEY remote_server_id (remote_server_id,setting)
-		) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+");
 $uninstall_queries = array("DROP TABLE IF EXISTS `".OGP_DB_PREFIX."fastdl_access_rules`;",
 						   "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."fastdl_settings`;");
 ?>
diff --git a/modules/gamemanager/module.php b/modules/gamemanager/module.php
index 376a43b0..0bcf4081 100755
--- a/modules/gamemanager/module.php
+++ b/modules/gamemanager/module.php
@@ -24,97 +24,10 @@
 
 // Module general information
 $module_title = "Game manager";
-$module_version = "1.33";
-$db_version = 9;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => 'game_monitor', 'name'=>'Game Monitor', 'group'=>'user' ) );
 $module_access_rights = array('u' => 'allow_updates', 'p' => 'allow_parameter_usage', 'e' => 'allow_extra_params', 'c' => 'allow_custom_fields');
 
-$install_queries[0] = array(
-    "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."home_ip_ports`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."home_ip_ports` (
-	`ip_id` int(11) NOT NULL,
-	`port` int(11) NOT NULL,
-	`home_id` int(11) NOT NULL,
-	PRIMARY KEY  (`ip_id`,`port`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."server_homes",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."server_homes` (
-	`home_id` int(50) NOT NULL auto_increment,
-	`remote_server_id` int(11) NOT NULL,
-	`user_id_main` int(11) NOT NULL,
-	`home_path` varchar(500) NOT NULL,
-	`home_cfg_id` int(50) NOT NULL,
-	`home_name` varchar(500) NOT NULL,
-	`control_password` VARCHAR( 128 ) NULL,
-	`ftp_password` VARCHAR( 128 ) NULL,
-	`last_param` LONGTEXT NULL,
-	PRIMARY KEY  (`home_id`),
-UNIQUE KEY remote_server_id (remote_server_id,home_path)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."rcon_presets;",
-"CREATE TABLE ".OGP_DB_PREFIX."rcon_presets (
-	`preset_id` int(50) NOT NULL auto_increment,
-	`name` varchar(20) NOT NULL,
-	`command` varchar(100) NOT NULL,
-	`home_cfg_id` int(50) NOT NULL,
-	`mod_cfg_id` int(50) NOT NULL,
-	PRIMARY KEY  (`preset_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."game_mods",
-"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."game_mods (
-    `mod_id` int(50) NOT NULL auto_increment,
-    `home_id` int(255) NOT NULL,
-    `mod_cfg_id` int(11) NOT NULL,
-    `max_players` smallint(3) default NULL,
-    `extra_params` varchar(255) default NULL,
-    `cpu_affinity` varchar(2) default NULL,
-    `nice` smallint(3) default '0',
-    `precmd` TEXT,
-    `postcmd` TEXT,
-    PRIMARY KEY (mod_id),
-UNIQUE KEY home_id (home_id,mod_cfg_id)
-				  ) ENGINE=MyISAM;");
-				  
-$install_queries[1] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `ftp_login` varchar(32) NULL;",
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `ftp_status` int(11) NOT NULL DEFAULT '0';");
-	
-$install_queries[2] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."status_cache`",	
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."status_cache` (
-  `date_timestamp` char(16) NOT NULL,
-  `ip_id` char(3) NOT NULL,
-  `port` char(6) NOT NULL,
-  `server_status_cache` longtext NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
-$install_queries[3] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `custom_fields` LONGTEXT NULL;");
-
-$install_queries[4] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."home_ip_ports` ADD `force_mod_id` int(11) NOT NULL DEFAULT '0';");
-
-$install_queries[5] = array(
-	"TRUNCATE `".OGP_DB_PREFIX."status_cache`;");
-	
-$install_queries[6] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `server_expiration_date` VARCHAR(21) NOT NULL default 'X';");
-
-$install_queries[7] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` drop index `remote_server_id`;"
-	);
-	
-$install_queries[8] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` ADD `home_user_order` INT NOT NULL default 99999;");
-	
-// Increase default column sizes
-$install_queries[9] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `home_path` VARCHAR(500);",
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `home_name` VARCHAR(500);",
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `control_password` VARCHAR(128);",
-	"ALTER TABLE `".OGP_DB_PREFIX."server_homes` MODIFY COLUMN `ftp_password` VARCHAR(128);");
 ?>
diff --git a/modules/lgsl_with_img_mod/module.php b/modules/lgsl_with_img_mod/module.php
index dd87dc3e..56690784 100755
--- a/modules/lgsl_with_img_mod/module.php
+++ b/modules/lgsl_with_img_mod/module.php
@@ -24,19 +24,14 @@
 
 // Module general information
 $module_title = "LGSL";
-$module_version = "0.2";
+$module_version = "1.0";
 $db_version = 0;
 $module_required = FALSE;
 $module_menus = array( array( 'subpage' => 'lgsl', 'name'=>'LGSL', 'group'=>'user' ),
 					   array( 'subpage' => 'lgsl', 'name'=>'LGSL', 'group'=>'guest' ),
 					   array( 'subpage' => 'lgsl_admin', 'name'=>'LGSL Admin', 'group'=>'admin' ));
 
-$install_queries = array();
-$install_queries[0] = array(
-						"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."lgsl
-						 (
-
-						  `id`         INT     (11)  NOT NULL auto_increment,
+  NOT NULL auto_increment,
 						  `type`       VARCHAR (50)  NOT NULL DEFAULT '',
 						  `ip`         VARCHAR (255) NOT NULL DEFAULT '',
 						  `c_port`     VARCHAR (5)   NOT NULL DEFAULT '0',
diff --git a/modules/modulemanager/module.php b/modules/modulemanager/module.php
index e738ae00..a49da50f 100755
--- a/modules/modulemanager/module.php
+++ b/modules/modulemanager/module.php
@@ -24,22 +24,11 @@
 
 // Module general information
 $module_title = "Module manager";
-$module_version = "1.1";
-$db_version = 2;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array(
 	array( 'subpage' => '', 'name'=>'Modules', 'group'=>'admin' )
 	);
-	
-## You will need uncomment the next three lines (remove /* from the beginning and */ from the end) 
-## of the next array if you are updating from a version previous or equal to 2429:
-$install_queries[0] = array();
-$install_queries[1] = array();
-$install_queries[2] = array("DROP TABLE IF EXISTS ".OGP_DB_PREFIX."module_access_rights",
-							"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."module_access_rights` (".
-							"`module_id` int(11) NOT NULL COMMENT 'This references to modules.id',".
-							"`flag` char(1) NOT NULL,".
-							"`description` varchar(64) NOT NULL,".
-							"UNIQUE (`flag`)".
-							") ENGINE=MyISAM DEFAULT CHARSET=latin1;");
+
 ?>
diff --git a/modules/mysql/module.php b/modules/mysql/module.php
index c99ed89b..79a77202 100755
--- a/modules/mysql/module.php
+++ b/modules/mysql/module.php
@@ -24,36 +24,9 @@
 
 // Module general information
 $module_title = "MySQL";
-$module_version = "0.1";
+$module_version = "1.0";
 $db_version = 0;
 $module_required = TRUE;
 $module_menus = array( array( 'subpage' => 'mysql_admin', 'name'=>'MySQL Admin', 'group'=>'admin' ) );
 
-$install_queries[0] = array(
-    "DROP TABLE IF EXISTS `".OGP_DB_PREFIX."mysql_servers`;",
-    "CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."mysql_servers` (
-	`mysql_server_id` int(11) NOT NULL auto_increment,
-	`remote_server_id` int(11) NOT NULL,
-	`mysql_name` varchar(100) NOT NULL,
-	`mysql_ip` varchar(255) NOT NULL,
-	`mysql_port` int(11) NOT NULL,
-	`mysql_root_passwd` VARCHAR( 32 ) NULL,
-	`privilegies_str` LONGTEXT NULL,
-	PRIMARY KEY  (`mysql_server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-
-"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."mysql_databases",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."mysql_databases` (
-	`db_id` int(11) NOT NULL auto_increment,
-	`mysql_server_id` int(11) NOT NULL,
-	`home_id` int(11) NOT NULL,
-	`db_user` varchar(50) NOT NULL,
-	`db_passwd` varchar(50) NOT NULL,
-	`db_name` varchar(50) NOT NULL,
-	`enabled` int(11) NOT NULL,
-	PRIMARY KEY  (`db_id`),
-	UNIQUE KEY (`mysql_server_id`,`db_name`),
-	UNIQUE KEY (`mysql_server_id`,`db_user`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
 ?>
diff --git a/modules/server/module.php b/modules/server/module.php
index feb785b5..269fe728 100755
--- a/modules/server/module.php
+++ b/modules/server/module.php
@@ -24,71 +24,11 @@
 
 // Module general information
 $module_title = "Server manager";
-$module_version = "1.6.1";
-$db_version = 7;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array(
 	array( 'subpage' => '', 'name'=>'Servers', 'group'=>'admin' )
 	);
 
-$install_queries = array();
-$install_queries[0] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_server_ips`;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_server_ips` (
-  `ip_id` int(11) NOT NULL AUTO_INCREMENT,
-  `remote_server_id` int(11) NOT NULL,
-  `ip` varchar(255) NOT NULL,
-  PRIMARY KEY (`ip_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."remote_servers`;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."remote_servers` (
-  `remote_server_id` int(11) NOT NULL auto_increment,
-  `remote_server_name` varchar(100) NOT NULL,
-  `ogp_user` varchar(100) NOT NULL,
-  `agent_ip` varchar(255) NOT NULL,
-  `agent_port` int(11) NOT NULL,
-  `ftp_port` int(11) NOT NULL,
-  `encryption_key` varchar(50) NOT NULL,
-  `timeout` int(11) NOT NULL,
-  PRIMARY KEY  (`remote_server_id`),
-  UNIQUE KEY `agent_ip` (`agent_ip`,`agent_port`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='Remote servers and IPs';");
-
-$install_queries[1] = array(	
-	"ALTER TABLE `".OGP_DB_PREFIX."remote_servers` 
-	 ADD `use_nat` int(11) NOT NULL;"); 
-$install_queries[2] = array(
-	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
-	 ADD `ufw_status` CHAR(8);");
-$install_queries[3] = array(
-	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
-	 ADD `ftp_ip` varchar(255) NOT NULL;");
-	 
-$install_queries[4] = array(
-"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."arrange_ports`;",
-"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."arrange_ports` (
-  `range_id` int(11) NOT NULL auto_increment,
-  `ip_id` int(11) NOT NULL,
-  `home_cfg_id` int(11) NOT NULL,
-  `start_port` smallint(11) unsigned NOT NULL,
-  `end_port` smallint(11) unsigned NOT NULL,
-  `port_increment` smallint(11) unsigned NOT NULL,
-  PRIMARY KEY  (`range_id`),
-  UNIQUE KEY `ip_id` (`ip_id`,`home_cfg_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COMMENT='Remote servers and IPs';");
-
-$install_queries[5] = array(
-	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
-	 DROP COLUMN `ufw_status`;",
-	"ALTER TABLE `OGP_DB_PREFIXremote_servers` 
-	 ADD `firewall_settings` LONGTEXT NULL;");
-
-$install_queries[6] = array(
-        "ALTER TABLE `OGP_DB_PREFIXremote_servers`
-	ADD `display_public_ip` varchar(15) NOT NULL;");
-
-$install_queries[7] = array(
-        "ALTER TABLE `OGP_DB_PREFIXremote_servers`
-        MODIFY `display_public_ip` varchar(255) NOT NULL;");
-
 ?>
diff --git a/modules/settings/module.php b/modules/settings/module.php
index acf1d588..be553cac 100755
--- a/modules/settings/module.php
+++ b/modules/settings/module.php
@@ -24,23 +24,12 @@
 
 // Module general information
 $module_title = "Settings";
-$module_version = "1.1";
-$db_version = 1;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array(
     array( 'subpage' => '', 'name'=>'Panel Settings', 'group'=>'admin' ),
 	array( 'subpage' => 'themes', 'name'=>'Theme Settings', 'group'=>'admin' )
 );
 
-$install_queries = array();
-$install_queries[0] = array(
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."settings;",
-    "CREATE TABLE ".OGP_DB_PREFIX."settings (
-        `setting` varchar(63) NOT NULL,
-        `value` varchar(255) NOT NULL,
-        PRIMARY KEY  (`setting`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
-$install_queries[1] = array(
-    "ALTER TABLE `".OGP_DB_PREFIX."settings` CHANGE `value` `value` VARCHAR( 1024 ) NOT NULL;");
 ?>
diff --git a/modules/tickets/module.php b/modules/tickets/module.php
index dc31d6fa..e25f4a89 100755
--- a/modules/tickets/module.php
+++ b/modules/tickets/module.php
@@ -23,8 +23,8 @@
  */
 
 $module_title = "Tickets";
-$module_version = "1.0a";
-$db_version = 3;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = false;
 $module_menus = array(
 					array(
@@ -39,71 +39,4 @@ $module_menus = array(
 					),
 				);
 
-$install_queries[0] = array(
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."ticket_replies`",
-
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."ticket_messages`",
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."ticket_attachments`",
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."ticket_settings`",
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."tickets`",
-
-	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."tickets` (
-		`tid` int NOT NULL AUTO_INCREMENT,
-		`uid` varchar(32) NOT NULL UNIQUE,
-		`user_id` int NOT NULL,
-		`parent_id` int NOT NULL,
-		`user_ip` varbinary(16) NOT NULL,
-		`subject` varchar(64) NOT NULL,
-		`service_id` int,
-		`created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-		`last_updated` varchar(22),
-		`status` tinyint NOT NULL,
-		`assigned_to` tinyint,
-		PRIMARY KEY (`tid`)
-	);",
-
-	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."ticket_messages` (
-		`reply_id` int NOT NULL AUTO_INCREMENT,
-		`ticket_id` int NOT NULL,
-		`user_id` int NOT NULL,
-		`user_ip` varbinary(16) NOT NULL,
-		`message` TEXT NOT NULL,
-		`date` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-		`rating` tinyint DEFAULT '0',
-		`is_admin` int DEFAULT '0',
-		PRIMARY KEY (`reply_id`)
-	);",
-
-	"ALTER TABLE `".OGP_DB_PREFIX."ticket_messages` ADD CONSTRAINT `".OGP_DB_PREFIX."ticket_messages_fk0` FOREIGN KEY (`ticket_id`) REFERENCES `".OGP_DB_PREFIX."tickets`(`tid`);",
-);
-
-$install_queries[1] = array(
-	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."ticket_attachments` (
-		`attachment_id` int NOT NULL AUTO_INCREMENT,
-		`ticket_id` int NOT NULL,
-		`reply_id` int,
-		`original_name` varchar(255) NOT NULL,
-		`unique_name` varchar(32) NOT NULL UNIQUE,
-		PRIMARY KEY (`attachment_id`)
-	);",
-);
-
-$install_queries[2] = array(
-	"CREATE TABLE IF NOT EXISTS `".OGP_DB_PREFIX."ticket_settings` (
-		`id` INT NOT NULL AUTO_INCREMENT,
-		`setting_name` varchar(32) NOT NULL UNIQUE,
-		`setting_value` TEXT NOT NULL,
-		PRIMARY KEY (`id`)
-	);",
-	
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('ratings_enabled', true) ON DUPLICATE KEY UPDATE `setting_name` = 'ratings_enabled', `setting_value` = true",
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('attachments_enabled', true) ON DUPLICATE KEY UPDATE `setting_name` = 'attachments_enabled', `setting_value` = true",
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('attachment_max_size', '52428800') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_max_size', `setting_value` = '52428800'",
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('attachment_limit', '5') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_limit', `setting_value` = '5'",
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('attachment_save_dir', '".__DIR__ . '/uploads' ."') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_save_dir', `setting_value` = '".__DIR__ . '/uploads' ."'",
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('attachment_extensions', 'jpg, gif, jpeg, jpg, png, pdf, txt, sql, zip') ON DUPLICATE KEY UPDATE `setting_name` = 'attachment_extensions', `setting_value` = 'jpg, gif, jpeg, jpg, png, pdf, txt, sql, zip'",
-);
-
-$install_queries[3] = array(
-	"INSERT INTO `".OGP_DB_PREFIX."ticket_settings` (setting_name, setting_value) VALUES ('notifications_enabled', true) ON DUPLICATE KEY UPDATE `setting_name` = 'notifications_enabled', `setting_value` = true",
-);
+?>
diff --git a/modules/tshock/module.php b/modules/tshock/module.php
index 73e92e43..050ca87e 100755
--- a/modules/tshock/module.php
+++ b/modules/tshock/module.php
@@ -24,19 +24,9 @@
 
 // Module general information
 $module_title = "tshock";
-$module_version = "Alpha";
+$module_version = "1.0";
 $db_version = 0;
 $module_required = FALSE;
 $module_menus = array( array( 'subpage' => '', 'name'=>'tshock', 'group'=>'user' ) );
 
-$install_queries = array();
-$install_queries[0] = array(
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."tshock;",
-    "CREATE TABLE ".OGP_DB_PREFIX."tshock (
-        `token_id` int(11) NOT NULL auto_increment,
-		`ip` varchar(255) NOT NULL,
-		`port` int(11) NOT NULL,
-		`token` varchar(64) NOT NULL,
-        PRIMARY KEY  (`token_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
 ?>
diff --git a/modules/update/module.php b/modules/update/module.php
index ac0f930e..e518c415 100755
--- a/modules/update/module.php
+++ b/modules/update/module.php
@@ -24,24 +24,16 @@
 
 // Module general information
 $module_title = "Update";
-$module_version = "1.1";
-$db_version = 2; // avoid 'duplicate table' error message.
+$module_version = "1.0";
+$db_version = 0; // avoid 'duplicate table' error message.
 $module_required = TRUE;
 $module_menus = array(
     array( 'subpage' => '', 'name'=>'Update', 'group'=>'admin' )
 );
 
-$install_queries = array();
-$install_queries[0] = array();
-$install_queries[1] = array(
-    "CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."update_blacklist (
-        `file_path` VARCHAR(1000) UNIQUE NOT NULL
+ UNIQUE NOT NULL
     ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-$install_queries[2] = array(
-	"DELETE FROM ".OGP_DB_PREFIX."update_blacklist
-WHERE file_path IN (SELECT * 
-             FROM (SELECT file_path FROM ".OGP_DB_PREFIX."update_blacklist 
-                   GROUP BY file_path HAVING (COUNT(*) > 1)
+ > 1)
                   ) AS A
             );",
     "ALTER TABLE ".OGP_DB_PREFIX."update_blacklist MODIFY file_path VARCHAR(1000);",
diff --git a/modules/user_admin/module.php b/modules/user_admin/module.php
index 37b2faf0..0f265b2a 100755
--- a/modules/user_admin/module.php
+++ b/modules/user_admin/module.php
@@ -24,72 +24,12 @@
 
 // Module general information
 $module_title = "User admin";
-$module_version = "1.1";
-$db_version = 7;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array(
     array( 'subpage' => '', 'name'=>'User Admin', 'group'=>'admin' ),
     array( 'subpage' => 'show_groups', 'name'=>'Group Admin', 'group'=>'admin' )
 );
 
-$install_queries = array();
-$install_queries[0] = array(
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."users;",
-    "CREATE TABLE ".OGP_DB_PREFIX."users (
-        `user_id` int(11) NOT NULL auto_increment,
-        `users_login` varchar(255) NOT NULL,
-        `users_passwd` varchar(255) NOT NULL,
-        `users_lang` varchar(20) NOT NULL default 'English',
-        `users_role` varchar(30) NOT NULL default 'user',
-        `users_group` varchar(100) NULL,
-        `users_fname` varchar(255) NULL,
-        `users_lname` varchar(255) NULL,
-        `users_email` varchar(255) NULL,
-        `users_phone` varchar(12) NULL,
-        `users_city` varchar(255) NULL,
-        `users_province` varchar(255) NULL,
-        `users_country` varchar(255) NULL,
-        `users_comment` text NULL,
-        `users_theme` varchar(255) NULL,
-        `user_expires` varchar(30) NOT NULL default 'X',
-        PRIMARY KEY  (`users_login`),
-		UNIQUE KEY `id` (`user_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_groups;",
-    "CREATE TABLE ".OGP_DB_PREFIX."user_groups (
-        `user_id` int(11) NOT NULL,
-        `role_id` int(11) NULL,
-        `group_id` int(11) NOT NULL,
-        PRIMARY KEY (`user_id`,`group_id`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_role_info;",
-    "CREATE TABLE ".OGP_DB_PREFIX."user_role_info (
-        `role_id` int(11) NOT NULL auto_increment,
-        `role_name` varchar(100) NULL,
-        PRIMARY KEY (`role_id`), UNIQUE KEY (`role_name`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-    "DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_info;",
-    "CREATE TABLE ".OGP_DB_PREFIX."user_group_info (
-        `group_id` int(11) NOT NULL auto_increment,
-        `group_name` varchar(255), PRIMARY KEY (`group_id`),
-        UNIQUE KEY (`group_name`)
-        ) ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
-$install_queries[1] = array("ALTER TABLE `".OGP_DB_PREFIX."user_group_info` ADD `main_user_id` int(11) NULL;");
-$install_queries[2] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `users_parent` int(11) NULL;");
-$install_queries[3] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."users` CHANGE `users_email` `users_email` VARCHAR( 255 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL",
-	"UPDATE ".OGP_DB_PREFIX."users
-	JOIN (
-		SELECT users_email, MIN(user_id) minID
-		FROM ".OGP_DB_PREFIX."users
-		GROUP BY users_email
-		HAVING COUNT(*) > 1
-	) t2 ON ".OGP_DB_PREFIX."users.users_email = t2.users_email AND ".OGP_DB_PREFIX."users.user_id != t2.minID
-	SET ".OGP_DB_PREFIX."users.users_email = DEFAULT;",
-	"ALTER TABLE `".OGP_DB_PREFIX."users` ADD UNIQUE `email` (`users_email`);");
-$install_queries[4] = array("UPDATE ".OGP_DB_PREFIX."users SET users_email = DEFAULT WHERE users_email = '';");
-$install_queries[5] = array("ALTER TABLE `".OGP_DB_PREFIX."user_groups` MODIFY group_id int(11) NOT NULL;");
-$install_queries[6] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `users_page_limit` int(11) NULL DEFAULT 25;");
-$install_queries[7] = array("ALTER TABLE `".OGP_DB_PREFIX."users` ADD `user_receives_emails` tinyint(1) NOT NULL DEFAULT 1;");
 ?>
diff --git a/modules/user_games/module.php b/modules/user_games/module.php
index 2a6cedab..da973f02 100755
--- a/modules/user_games/module.php
+++ b/modules/user_games/module.php
@@ -24,49 +24,11 @@
 
 // Module general information
 $module_title = "User games";
-$module_version = "1.3";
-$db_version = 3;
+$module_version = "1.0";
+$db_version = 0;
 $module_required = TRUE;
 $module_menus = array(
 	array( 'subpage' => '', 'name'=>'Game Servers', 'group'=>'admin' )
 );
-$install_queries = array();
-$install_queries[0] = array(
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."user_homes`;",
-	"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."user_homes (
-		`home_id` int(11) NOT NULL,
-		`user_id` int(11) NOT NULL,
-		`access_rights` varchar(63) default NULL,
-		PRIMARY KEY (`user_id`,`home_id`)
-	) ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_remote_servers;",
-	"CREATE TABLE ".OGP_DB_PREFIX."user_group_remote_servers (
-		`remote_server_id` int(11) NOT NULL,
-		`group_id` int(11) NOT NULL,
-		`access_rights` varchar(63) default NULL,
-		PRIMARY KEY (`remote_server_id`, `group_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;",
-	"DROP TABLE IF EXISTS ".OGP_DB_PREFIX."user_group_homes;",
-	"CREATE TABLE ".OGP_DB_PREFIX."user_group_homes (
-		`home_id` int(11) NOT NULL,
-		`group_id` int(11) NOT NULL,
-		`access_rights` varchar(63) default NULL,
-		PRIMARY KEY (`home_id`, `group_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;");
 
-$install_queries[1] = array(
-	"DROP TABLE IF EXISTS `".OGP_DB_PREFIX."master_server_homes`;",
-	"CREATE TABLE IF NOT EXISTS ".OGP_DB_PREFIX."master_server_homes (
-		`home_id` int(11) NOT NULL,
-		`home_cfg_id` int(11) NOT NULL,
-		`remote_server_id` int(11) NOT NULL,
-		PRIMARY KEY (`remote_server_id`, `home_cfg_id`)
-	)ENGINE=MyISAM DEFAULT CHARSET=latin1;");
-
-$install_queries[2] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."user_homes` ADD `user_expiration_date` VARCHAR(21) NOT NULL default 'X';",
-	"ALTER TABLE `".OGP_DB_PREFIX."user_group_homes` ADD `user_group_expiration_date` VARCHAR(21) NOT NULL default 'X';");
-
-$install_queries[3] = array(
-	"ALTER TABLE `".OGP_DB_PREFIX."game_mods` modify column `cpu_affinity` varchar(64) null AFTER `extra_params`, comment = 'utf8mb4_general_ci';");
 ?>