diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql
index 5c1fafed2..6a7bd30ed 100644
--- a/data/storage/mysql/create_tariffplan_tables.sql
+++ b/data/storage/mysql/create_tariffplan_tables.sql
@@ -227,60 +227,6 @@ CREATE TABLE tp_chargers (
     `id`,`filter_ids`,`run_id`,`attribute_ids`)
 );
 
---
--- Table structure for table `tp_dispatchers`
---
-
-DROP TABLE IF EXISTS tp_dispatcher_profiles;
-CREATE TABLE tp_dispatcher_profiles (
-  `pk` int(11) NOT NULL AUTO_INCREMENT,
-  `tpid` varchar(64) NOT NULL,
-  `tenant` varchar(64) NOT NULL,
-  `id` varchar(64) NOT NULL,
-  `filter_ids` varchar(64) NOT NULL,
-  `activation_interval` varchar(64) NOT NULL,
-  `strategy` varchar(64) NOT NULL,
-  `strategy_parameters` varchar(64) NOT NULL,
-  `conn_id` varchar(64) NOT NULL,
-  `conn_filter_ids` varchar(64) NOT NULL,
-  `conn_weight` decimal(8,2) NOT NULL,
-  `conn_blocker` BOOLEAN NOT NULL,
-  `conn_parameters` varchar(64) NOT NULL,
-  `weight` decimal(8,2) NOT NULL,
-  `created_at` TIMESTAMP,
-  PRIMARY KEY (`pk`),
-  KEY `tpid` (`tpid`),
-  UNIQUE KEY `unique_tp_dispatcher_profiles` (`tpid`,`tenant`,
-    `id`,`filter_ids`,`strategy`,`conn_id`,`conn_filter_ids`)
-);
-
---
--- Table structure for table `tp_dispatchers`
---
-
-DROP TABLE IF EXISTS tp_dispatcher_hosts;
-CREATE TABLE tp_dispatcher_hosts (
-  `pk` int(11) NOT NULL AUTO_INCREMENT,
-  `tpid` varchar(64) NOT NULL,
-  `tenant` varchar(64) NOT NULL,
-  `id` varchar(64) NOT NULL,
-  `address` varchar(64) NOT NULL,
-  `transport` varchar(64) NOT NULL,
-  `connect_attempts` int(11) NOT NULL,
-  `reconnects` int(11) NOT NULL,
-  `max_reconnect_interval` varchar(64) NOT NULL,
-  `connect_timeout` varchar(64) NOT NULL,
-  `reply_timeout` varchar(64) NOT NULL,
-  `tls` BOOLEAN NOT NULL,
-  `client_key` varchar(64) NOT NULL,
-  `client_certificate` varchar(64) NOT NULL,
-  `ca_certificate` varchar(64) NOT NULL,
-  `created_at` TIMESTAMP,
-  PRIMARY KEY (`pk`),
-  KEY `tpid` (`tpid`),
-  UNIQUE KEY `unique_tp_dispatchers_hosts` (`tpid`,`tenant`,
-    `id`,`address`)
-);
 
 --
 -- Table structure for table `tp_rate_profiles`
diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql
index 3992b5288..1ccea1971 100644
--- a/data/storage/postgres/create_tariffplan_tables.sql
+++ b/data/storage/postgres/create_tariffplan_tables.sql
@@ -219,59 +219,6 @@ CREATE INDEX tp_routes_unique ON tp_routes  ("tpid",  "tenant", "id",
   CREATE INDEX tp_chargers_unique ON tp_chargers  ("tpid",  "tenant", "id",
     "filter_ids","run_id","attribute_ids");
 
-  --
-  -- Table structure for table `tp_dispatchers`
-  --
-
-  DROP TABLE IF EXISTS tp_dispatcher_profiles;
-  CREATE TABLE tp_dispatcher_profiles (
-  "pk" SERIAL PRIMARY KEY,
-  "tpid" varchar(64) NOT NULL,
-  "tenant" varchar(64) NOT NULL,
-  "id" varchar(64) NOT NULL,
-  "filter_ids" varchar(64) NOT NULL,
-  "activation_interval" varchar(64) NOT NULL,
-  "strategy" varchar(64) NOT NULL,
-  "strategy_parameters" varchar(64) NOT NULL,
-  "conn_id" varchar(64) NOT NULL,
-  "conn_filter_ids" varchar(64) NOT NULL,
-  "conn_weight" decimal(8,2) NOT NULL,
-  "conn_blocker" BOOLEAN NOT NULL,
-  "conn_parameters" varchar(64) NOT NULL,
-  "weight" decimal(8,2) NOT NULL,
-  "created_at" TIMESTAMP WITH TIME ZONE
-  );
-  CREATE INDEX tp_dispatcher_profiles_ids ON tp_dispatcher_profiles (tpid);
-  CREATE INDEX tp_dispatcher_profiles_unique ON tp_dispatcher_profiles  ("tpid",  "tenant", "id",
-    "filter_ids","strategy","conn_id","conn_filter_ids");
-
---
--- Table structure for table `tp_dispatchers`
---
-
-  DROP TABLE IF EXISTS tp_dispatcher_hosts;
-  CREATE TABLE tp_dispatcher_hosts (
-  "pk" SERIAL PRIMARY KEY,
-  "tpid" varchar(64) NOT NULL,
-  "tenant" varchar(64) NOT NULL,
-  "id" varchar(64) NOT NULL,
-  "address" varchar(64) NOT NULL,
-  "transport" varchar(64) NOT NULL,
-  "connect_attempts" INTEGER NOT NULL,
-  "reconnects" INTEGER NOT NULL,
-  "max_reconnect_interval" varchar(64) NOT NULL,
-  "connect_timeout" varchar(64) NOT NULL,
-  "reply_timeout" varchar(64) NOT NULL,
-  "tls" BOOLEAN NOT NULL,
-  "client_key" varchar(64) NOT NULL,
-  "client_certificate" varchar(64) NOT NULL,
-  "ca_certificate" varchar(64) NOT NULL,
-  "created_at" TIMESTAMP WITH TIME ZONE
-  );
-  CREATE INDEX tp_dispatchers_hosts_ids ON tp_dispatcher_hosts (tpid);
-  CREATE INDEX tp_dispatcher_hosts_unique ON tp_dispatcher_hosts  ("tpid",  "tenant", "id",
-    "address");
-
 --
 -- Table structure for table `tp_rate_profiles`
 --