diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index a46c4e75c020d65810da0120d01fb1466fa79b93..94ce7e758422a6bc80e16f032fa27644da3c9a41 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -40,123 +40,6 @@ SET FOREIGN_KEY_CHECKS = 0;
-- --------------------------------------------------------
-- --------------------------------------------------------
---
--- Table structure for table `billing_invoice`
---
-
-CREATE TABLE `billing_invoice` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `invoice_number` varchar(32) NOT NULL default '',
- `invoice_date` date default NULL,
- `xml` longtext NOT NULL,
- `total_fee` decimal(10,2) NOT NULL default '0.00',
- `total_fee_taxed` decimal(10,2) NOT NULL default '0.00',
- `currency` char(3) default 'EUR',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_product`
---
-
-CREATE TABLE `billing_product` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `parent_id` int(11) unsigned NOT NULL default '0',
- `product_name` varchar(64) default NULL,
- `product_details` varchar(255) default NULL,
- `template_id` int(11) unsigned NOT NULL default '0',
- `service_class_id` int(11) unsigned NOT NULL default '0',
- `taxclass` int(11) unsigned NOT NULL default '0',
- `setup_fee` decimal(10,2) NOT NULL default '0.00',
- `interval_fee` decimal(10,2) NOT NULL default '0.00',
- `interval_length` tinyint(3) NOT NULL default '0',
- `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
- `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
- `clearing_period` tinyint(3) unsigned default '1',
- `currency` char(3) default 'EUR',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_service`
---
-
-CREATE TABLE `billing_service` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `product_id` int(11) unsigned default NULL,
- `product_parent_id` int(11) unsigned default NULL,
- `product_name` varchar(64) default NULL,
- `product_details` varchar(255) default NULL,
- `service_class_id` int(11) unsigned default '0',
- `service_template_id` int(11) unsigned default NULL,
- `service_id` int(11) unsigned default NULL,
- `taxclass` int(11) unsigned NOT NULL default '1',
- `quantity` smallint(5) unsigned NOT NULL default '1',
- `setup_fee` decimal(10,2) NOT NULL default '0.00',
- `interval_fee` decimal(10,2) default '0.00',
- `interval_fee_is_individual` tinyint(1) default '0',
- `interval_length` int(11) NOT NULL default '1',
- `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
- `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
- `clearing_period` tinyint(3) unsigned default '1',
- `currency` char(3) default 'EUR',
- `is_active` tinyint(1) NOT NULL default '0',
- `servicestart_at` date default NULL,
- `serviceend_at` date default NULL,
- `invoiced_upto` date default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_service_class`
---
-
-CREATE TABLE `billing_service_class` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `name` varchar(64) NOT NULL default '',
- `sort_order` int(11) unsigned NOT NULL default '0',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_tax_class`
---
-
-CREATE TABLE `billing_tax_class` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `name` varchar(64) NOT NULL default '',
- `taxrate` decimal(10,2) default NULL,
- `is_default` tinyint(1) NOT NULL default '0',
- `valid_from` date default NULL,
- `valid_till` date default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `client`
--
@@ -223,38 +106,6 @@ CREATE TABLE `client` (
-- --------------------------------------------------------
---
--- Table structure for table `client_address_book`
---
-
-CREATE TABLE `client_address_book` (
- `address_book_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_other` varchar(5) default NULL,
- `role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
- `entry_company` varchar(64) default NULL,
- `entry_gender` enum('m','f') default NULL,
- `entry_title` varchar(16) default NULL,
- `entry_firstname` varchar(32) NOT NULL,
- `entry_lastname` varchar(32) NOT NULL,
- `entry_address1` varchar(64) default NULL,
- `entry_address2` varchar(64) default NULL,
- `entry_postcode` varchar(32) NOT NULL,
- `entry_city` varchar(64) NOT NULL,
- `entry_state` varchar(32) default NULL,
- `entry_country` char(2) default NULL,
- `entry_phone` varchar(32) default NULL,
- `entry_fax` varchar(32) default NULL,
- `entry_mobile` varchar(32) default NULL,
- `entry_email` varchar(255) default NULL,
- PRIMARY KEY (`address_book_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `client_template`
--
@@ -370,90 +221,6 @@ CREATE TABLE `dns_template` (
-- --------------------------------------------------------
---
--- Table structure for table `domain`
---
-
-CREATE TABLE `domain` (
- `domain_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `domain_provider_id` int(11) unsigned NOT NULL default '0',
- `provider_domain_id` int(11) unsigned default NULL,
- `domain` varchar(255) NOT NULL default '',
- `tld` varchar(32) NOT NULL default '',
- `handle_desc` varchar(32) default NULL,
- `handle_adminc` varchar(32) default NULL,
- `handle_techc` varchar(32) default NULL,
- `handle_zonec` varchar(32) default NULL,
- `added_at` timestamp NULL default NULL,
- `connected_at` date default NULL,
- `disconnected_at` date default NULL,
- `status` varchar(64) NOT NULL default '0',
- PRIMARY KEY (`domain_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_handle`
---
-
-CREATE TABLE `domain_handle` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `domain_registrar` varchar(64) default NULL,
- `handle` varchar(32) default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_provider`
---
-
-CREATE TABLE `domain_provider` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `provider` varchar(255) default NULL,
- `is_extern` tinyint(1) NOT NULL default '0',
- `domainrobot_interface` varchar(16) default '',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_tld`
---
-
-CREATE TABLE `domain_tld` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_all` varchar(5) default NULL,
- `tld` varchar(32) default NULL,
- `domain_provider_id` int(11) unsigned NOT NULL default '0',
- `domain_registrar` varchar(64) default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `firewall`
--
@@ -1320,23 +1087,6 @@ CREATE TABLE `country` (
-- --------------------------------------------------------
-- --------------------------------------------------------
---
--- Dumping data for table `billing_service_class`
---
-
-INSERT INTO `billing_service_class` VALUES (1,'other',9999);
-INSERT INTO `billing_service_class` VALUES (2,'hosting',10);
-INSERT INTO `billing_service_class` VALUES (3,'domains',20);
-INSERT INTO `billing_service_class` VALUES (4,'traffic',30);
-INSERT INTO `billing_service_class` VALUES (5,'diskspace',40);
-
---
--- Dumping data for table `billing_tax_class`
---
-
-INSERT INTO `billing_tax_class` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
-INSERT INTO `billing_tax_class` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
-
--
-- Dumping data for table `dns_template`
--