diff --git a/data/conf/samples/internal_ttl_internal/cgrates.json b/data/conf/samples/internal_ttl_internal/cgrates.json
deleted file mode 100644
index 5aba18deb..000000000
--- a/data/conf/samples/internal_ttl_internal/cgrates.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-
-
-"general": {
-	"log_level": 7,
-},
-
-
-"listen": {
-	"rpc_json": ":2012",
-	"rpc_gob": ":2013",
-	"http": ":2080",
-},
-
-
-"data_db": {
-	"db_type": "*internal",	
-},
-
-
-
-
-"rals": {
-	"enabled": true,
-},
-
-
-"schedulers": {
-	"enabled": true,
-	"cdrs_conns": ["*internal"],
-},
-
-
-"cdrs": {
-	"enabled": true,
-},
-
-
-"chargers": {
-	"enabled": true,
-},
-
-
-"admins": {
-	"enabled": true,
-	"scheduler_conns": ["*internal"],
-},
-
-
-}
diff --git a/data/tariffplans/account_action_from_tutorial/AccountActions.csv b/data/tariffplans/account_action_from_tutorial/AccountActions.csv
deleted file mode 100644
index 7b334c8be..000000000
--- a/data/tariffplans/account_action_from_tutorial/AccountActions.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
-cgrates.org,AccountWithAPFromTutorial,AP_PACKAGE_10,,,
diff --git a/data/tariffplans/hundredrates/Chargers.csv b/data/tariffplans/hundredrates/Chargers.csv
deleted file mode 100644
index 65a4d073c..000000000
--- a/data/tariffplans/hundredrates/Chargers.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,RunID,AttributeIDs
-cgrates.org,DEFAULT,,;0,*default,*none
\ No newline at end of file
diff --git a/data/tariffplans/hundredrates/DestinationRates.csv b/data/tariffplans/hundredrates/DestinationRates.csv
deleted file mode 100644
index 8a8cf93e0..000000000
--- a/data/tariffplans/hundredrates/DestinationRates.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy
-DR_100,DST_100,RT_100,*up,20,0,
-DR_101,DST_101,RT_101,*up,20,0,
-DR_102,DST_102,RT_102,*up,20,0,
-DR_103,DST_103,RT_103,*up,20,0,
-DR_104,DST_104,RT_104,*up,20,0,
-DR_105,DST_105,RT_105,*up,20,0,
-DR_106,DST_106,RT_106,*up,20,0,
-DR_107,DST_107,RT_107,*up,20,0,
-DR_108,DST_108,RT_108,*up,20,0,
-DR_109,DST_109,RT_109,*up,20,0,
-DR_110,DST_110,RT_110,*up,20,0,
-DR_111,DST_111,RT_111,*up,20,0,
-DR_112,DST_112,RT_112,*up,20,0,
-DR_113,DST_113,RT_113,*up,20,0,
-DR_114,DST_114,RT_114,*up,20,0,
-DR_115,DST_115,RT_115,*up,20,0,
-DR_116,DST_116,RT_116,*up,20,0,
-DR_117,DST_117,RT_117,*up,20,0,
-DR_118,DST_118,RT_118,*up,20,0,
-DR_119,DST_119,RT_119,*up,20,0,
-DR_120,DST_120,RT_120,*up,20,0,
-DR_121,DST_121,RT_121,*up,20,0,
-DR_122,DST_122,RT_122,*up,20,0,
-DR_123,DST_123,RT_123,*up,20,0,
-DR_124,DST_124,RT_124,*up,20,0,
-DR_125,DST_125,RT_125,*up,20,0,
-DR_126,DST_126,RT_126,*up,20,0,
-DR_127,DST_127,RT_127,*up,20,0,
-DR_128,DST_128,RT_128,*up,20,0,
-DR_129,DST_129,RT_129,*up,20,0,
-DR_130,DST_130,RT_130,*up,20,0,
-DR_131,DST_131,RT_131,*up,20,0,
-DR_132,DST_132,RT_132,*up,20,0,
-DR_133,DST_133,RT_133,*up,20,0,
-DR_134,DST_134,RT_134,*up,20,0,
-DR_135,DST_135,RT_135,*up,20,0,
-DR_136,DST_136,RT_136,*up,20,0,
-DR_137,DST_137,RT_137,*up,20,0,
-DR_138,DST_138,RT_138,*up,20,0,
-DR_139,DST_139,RT_139,*up,20,0,
-DR_140,DST_140,RT_140,*up,20,0,
-DR_141,DST_141,RT_141,*up,20,0,
-DR_142,DST_142,RT_142,*up,20,0,
-DR_143,DST_143,RT_143,*up,20,0,
-DR_144,DST_144,RT_144,*up,20,0,
-DR_145,DST_145,RT_145,*up,20,0,
-DR_146,DST_146,RT_146,*up,20,0,
-DR_147,DST_147,RT_147,*up,20,0,
-DR_148,DST_148,RT_148,*up,20,0,
-DR_149,DST_149,RT_149,*up,20,0,
-DR_150,DST_150,RT_150,*up,20,0,
-DR_151,DST_151,RT_151,*up,20,0,
-DR_152,DST_152,RT_152,*up,20,0,
-DR_153,DST_153,RT_153,*up,20,0,
-DR_154,DST_154,RT_154,*up,20,0,
-DR_155,DST_155,RT_155,*up,20,0,
-DR_156,DST_156,RT_156,*up,20,0,
-DR_157,DST_157,RT_157,*up,20,0,
-DR_158,DST_158,RT_158,*up,20,0,
-DR_159,DST_159,RT_159,*up,20,0,
-DR_160,DST_160,RT_160,*up,20,0,
-DR_161,DST_161,RT_161,*up,20,0,
-DR_162,DST_162,RT_162,*up,20,0,
-DR_163,DST_163,RT_163,*up,20,0,
-DR_164,DST_164,RT_164,*up,20,0,
-DR_165,DST_165,RT_165,*up,20,0,
-DR_166,DST_166,RT_166,*up,20,0,
-DR_167,DST_167,RT_167,*up,20,0,
-DR_168,DST_168,RT_168,*up,20,0,
-DR_169,DST_169,RT_169,*up,20,0,
-DR_170,DST_170,RT_170,*up,20,0,
-DR_171,DST_171,RT_171,*up,20,0,
-DR_172,DST_172,RT_172,*up,20,0,
-DR_173,DST_173,RT_173,*up,20,0,
-DR_174,DST_174,RT_174,*up,20,0,
-DR_175,DST_175,RT_175,*up,20,0,
-DR_176,DST_176,RT_176,*up,20,0,
-DR_177,DST_177,RT_177,*up,20,0,
-DR_178,DST_178,RT_178,*up,20,0,
-DR_179,DST_179,RT_179,*up,20,0,
-DR_180,DST_180,RT_180,*up,20,0,
-DR_181,DST_181,RT_181,*up,20,0,
-DR_182,DST_182,RT_182,*up,20,0,
-DR_183,DST_183,RT_183,*up,20,0,
-DR_184,DST_184,RT_184,*up,20,0,
-DR_185,DST_185,RT_185,*up,20,0,
-DR_186,DST_186,RT_186,*up,20,0,
-DR_187,DST_187,RT_187,*up,20,0,
-DR_188,DST_188,RT_188,*up,20,0,
-DR_189,DST_189,RT_189,*up,20,0,
-DR_190,DST_190,RT_190,*up,20,0,
-DR_191,DST_191,RT_191,*up,20,0,
-DR_192,DST_192,RT_192,*up,20,0,
-DR_193,DST_193,RT_193,*up,20,0,
-DR_194,DST_194,RT_194,*up,20,0,
-DR_195,DST_195,RT_195,*up,20,0,
-DR_196,DST_196,RT_196,*up,20,0,
-DR_197,DST_197,RT_197,*up,20,0,
-DR_198,DST_198,RT_198,*up,20,0,
-DR_199,DST_199,RT_199,*up,20,0,
\ No newline at end of file
diff --git a/data/tariffplans/hundredrates/Destinations.csv b/data/tariffplans/hundredrates/Destinations.csv
deleted file mode 100644
index 3f35b69bb..000000000
--- a/data/tariffplans/hundredrates/Destinations.csv
+++ /dev/null
@@ -1,101 +0,0 @@
-#Id,Prefix
-DST_100,100
-DST_101,101
-DST_102,102
-DST_103,103
-DST_104,104
-DST_105,105
-DST_106,106
-DST_107,107
-DST_108,108
-DST_109,109
-DST_110,110
-DST_111,111
-DST_112,112
-DST_113,113
-DST_114,114
-DST_115,115
-DST_116,116
-DST_117,117
-DST_118,118
-DST_119,119
-DST_120,120
-DST_121,121
-DST_122,122
-DST_123,123
-DST_124,124
-DST_125,125
-DST_126,126
-DST_127,127
-DST_128,128
-DST_129,129
-DST_130,130
-DST_131,131
-DST_132,132
-DST_133,133
-DST_134,134
-DST_135,135
-DST_136,136
-DST_137,137
-DST_138,138
-DST_139,139
-DST_140,140
-DST_141,141
-DST_142,142
-DST_143,143
-DST_144,144
-DST_145,145
-DST_146,146
-DST_147,147
-DST_148,148
-DST_149,149
-DST_150,150
-DST_151,151
-DST_152,152
-DST_153,153
-DST_154,154
-DST_155,155
-DST_156,156
-DST_157,157
-DST_158,158
-DST_159,159
-DST_160,160
-DST_161,161
-DST_162,162
-DST_163,163
-DST_164,164
-DST_165,165
-DST_166,166
-DST_167,167
-DST_168,168
-DST_169,169
-DST_170,170
-DST_171,171
-DST_172,172
-DST_173,173
-DST_174,174
-DST_175,175
-DST_176,176
-DST_177,177
-DST_178,178
-DST_179,179
-DST_180,180
-DST_181,181
-DST_182,182
-DST_183,183
-DST_184,184
-DST_185,185
-DST_186,186
-DST_187,187
-DST_188,188
-DST_189,189
-DST_190,190
-DST_191,191
-DST_192,192
-DST_193,193
-DST_194,194
-DST_195,195
-DST_196,196
-DST_197,197
-DST_198,198
-DST_199,199
diff --git a/data/tariffplans/hundredrates/Filters.csv b/data/tariffplans/hundredrates/Filters.csv
deleted file mode 100644
index e69de29bb..000000000
diff --git a/data/tariffplans/hundredrates/Rates.csv b/data/tariffplans/hundredrates/Rates.csv
deleted file mode 100644
index 93b96ce85..000000000
--- a/data/tariffplans/hundredrates/Rates.csv
+++ /dev/null
@@ -1,132 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement
-cgrates.org,RP1,,,,,,RT_100,*string:~*req.PrefixDestination:100,,,,0s,0.82,0.9603,60s,60s
-cgrates.org,RP1,,,,,,RT_100,,,,,60s,0,0.4801,60s,1s
-cgrates.org,RP1,,,,,,RT_101,*string:~*req.PrefixDestination:101,,,,0s,0.37,0.3478,60s,60s
-cgrates.org,RP1,,,,,,RT_101,,,,,60s,0,0.1739,60s,1s
-cgrates.org,RP1,,,,,,RT_102,*string:~*req.PrefixDestination:102,,,,0s,0.94,0.7972,60s,60s
-cgrates.org,RP1,,,,,,RT_102,,,,,60s,0,0.3986,60s,1s
-cgrates.org,RP1,,,,,,RT_103,*string:~*req.PrefixDestination:103,,,,0s,0.46,0.2151,60s,60s
-cgrates.org,RP1,,,,,,RT_103,,,,,60s,0,0.1076,60s,1s
-cgrates.org,RP1,,,,,,RT_104,*string:~*req.PrefixDestination:104,,,,0s,0.01,0.5396,60s,60s
-cgrates.org,RP1,,,,,,RT_104,,,,,60s,0,0.2698,60s,1s
-cgrates.org,RP1,,,,,,RT_105,*string:~*req.PrefixDestination:105,,,,0s,0.57,0.9269,60s,60s
-cgrates.org,RP1,,,,,,RT_106,*string:~*req.PrefixDestination:106,,,,0s,0.13,0.3689,1s,1s
-cgrates.org,RP1,,,,,,RT_107,*string:~*req.PrefixDestination:107,,,,0s,0.66,0.7610,60s,60s
-cgrates.org,RP1,,,,,,RT_107,,,,,60s,0,0.3805,60s,1s
-cgrates.org,RP1,,,,,,RT_108,*string:~*req.PrefixDestination:108,,,,0s,0.22,0.1169,60s,60s
-cgrates.org,RP1,,,,,,RT_108,,,,,60s,0,0.0585,60s,1s
-cgrates.org,RP1,,,,,,RT_109,*string:~*req.PrefixDestination:109,,,,0s,0.77,0.5041,60s,60s
-cgrates.org,RP1,,,,,,RT_110,*string:~*req.PrefixDestination:110,,,,0s,0.30,0.9540,60s,60s
-cgrates.org,RP1,,,,,,RT_111,*string:~*req.PrefixDestination:111,,,,0s,0.85,0.3411,1s,1s
-cgrates.org,RP1,,,,,,RT_112,*string:~*req.PrefixDestination:112,,,,0s,0.41,0.6961,60s,60s
-cgrates.org,RP1,,,,,,RT_112,,,,,60s,0,0.3481,60s,1s
-cgrates.org,RP1,,,,,,RT_113,*string:~*req.PrefixDestination:113,,,,0s,0.97,0.0835,60s,60s
-cgrates.org,RP1,,,,,,RT_114,*string:~*req.PrefixDestination:114,,,,0s,0.62,0.5332,1s,1s
-cgrates.org,RP1,,,,,,RT_115,*string:~*req.PrefixDestination:115,,,,0s,0.18,0.8658,60s,60s
-cgrates.org,RP1,,,,,,RT_116,*string:~*req.PrefixDestination:116,,,,0s,0.74,0.2855,60s,60s
-cgrates.org,RP1,,,,,,RT_117,*string:~*req.PrefixDestination:117,,,,0s,0.27,0.7347,1s,1s
-cgrates.org,RP1,,,,,,RT_118,*string:~*req.PrefixDestination:118,,,,0s,0.82,0.1221,1s,1s
-cgrates.org,RP1,,,,,,RT_119,*string:~*req.PrefixDestination:119,,,,0s,0.38,0.4470,60s,60s
-cgrates.org,RP1,,,,,,RT_120,*string:~*req.PrefixDestination:120,,,,0s,0.94,0.8652,60s,60s
-cgrates.org,RP1,,,,,,RT_121,*string:~*req.PrefixDestination:121,,,,0s,0.47,0.3142,1s,1s
-cgrates.org,RP1,,,,,,RT_122,*string:~*req.PrefixDestination:122,,,,0s,0.03,0.7013,1s,1s
-cgrates.org,RP1,,,,,,RT_123,*string:~*req.PrefixDestination:123,,,,0s,0.58,0.0262,60s,60s
-cgrates.org,RP1,,,,,,RT_123,,,,,60s,0,0.0131,60s,1s
-cgrates.org,RP1,,,,,,RT_124,*string:~*req.PrefixDestination:124,,,,0s,0.11,0.4445,60s,60s
-cgrates.org,RP1,,,,,,RT_124,,,,,60s,0,0.2223,60s,1s
-cgrates.org,RP1,,,,,,RT_125,*string:~*req.PrefixDestination:125,,,,0s,0.66,0.8838,60s,60s
-cgrates.org,RP1,,,,,,RT_126,*string:~*req.PrefixDestination:126,,,,0s,0.22,0.2708,1s,1s
-cgrates.org,RP1,,,,,,RT_127,*string:~*req.PrefixDestination:127,,,,0s,0.78,0.5953,1s,1s
-cgrates.org,RP1,,,,,,RT_128,*string:~*req.PrefixDestination:128,,,,0s,0.43,0.0140,1s,1s
-cgrates.org,RP1,,,,,,RT_129,*string:~*req.PrefixDestination:129,,,,0s,0.99,0.4636,60s,60s
-cgrates.org,RP1,,,,,,RT_130,*string:~*req.PrefixDestination:130,,,,0s,0.55,0.8502,1s,1s
-cgrates.org,RP1,,,,,,RT_131,*string:~*req.PrefixDestination:131,,,,0s,0.07,0.1749,60s,60s
-cgrates.org,RP1,,,,,,RT_132,*string:~*req.PrefixDestination:132,,,,0s,0.64,0.5932,60s,60s
-cgrates.org,RP1,,,,,,RT_132,,,,,60s,0,0.2966,60s,1s
-cgrates.org,RP1,,,,,,RT_133,*string:~*req.PrefixDestination:133,,,,0s,0.19,0.0430,60s,60s
-cgrates.org,RP1,,,,,,RT_133,,,,,60s,0,0.0215,60s,1s
-cgrates.org,RP1,,,,,,RT_134,*string:~*req.PrefixDestination:134,,,,0s,0.74,0.4393,60s,60s
-cgrates.org,RP1,,,,,,RT_135,*string:~*req.PrefixDestination:135,,,,0s,0.27,0.7635,60s,60s
-cgrates.org,RP1,,,,,,RT_136,*string:~*req.PrefixDestination:136,,,,0s,0.83,0.1823,1s,1s
-cgrates.org,RP1,,,,,,RT_137,*string:~*req.PrefixDestination:137,,,,0s,0.39,0.6319,1s,1s
-cgrates.org,RP1,,,,,,RT_138,*string:~*req.PrefixDestination:138,,,,0s,0.92,0.0192,60s,60s
-cgrates.org,RP1,,,,,,RT_138,,,,,60s,0,0.0096,60s,1s
-cgrates.org,RP1,,,,,,RT_139,*string:~*req.PrefixDestination:139,,,,0s,0.47,0.3429,60s,60s
-cgrates.org,RP1,,,,,,RT_140,*string:~*req.PrefixDestination:140,,,,0s,0.03,0.7614,60s,60s
-cgrates.org,RP1,,,,,,RT_141,*string:~*req.PrefixDestination:141,,,,0s,0.59,0.2112,60s,60s
-cgrates.org,RP1,,,,,,RT_142,*string:~*req.PrefixDestination:142,,,,0s,0.24,0.5984,1s,1s
-cgrates.org,RP1,,,,,,RT_143,*string:~*req.PrefixDestination:143,,,,0s,0.80,0.9283,60s,60s
-cgrates.org,RP1,,,,,,RT_143,,,,,60s,0,0.4642,60s,1s
-cgrates.org,RP1,,,,,,RT_144,*string:~*req.PrefixDestination:144,,,,0s,0.35,0.3075,60s,60s
-cgrates.org,RP1,,,,,,RT_145,*string:~*req.PrefixDestination:145,,,,0s,0.88,0.7885,60s,60s
-cgrates.org,RP1,,,,,,RT_145,,,,,60s,0,0.3942,60s,1s
-cgrates.org,RP1,,,,,,RT_146,*string:~*req.PrefixDestination:146,,,,0s,0.44,0.1760,60s,60s
-cgrates.org,RP1,,,,,,RT_147,*string:~*req.PrefixDestination:147,,,,0s,0.00,0.5002,60s,60s
-cgrates.org,RP1,,,,,,RT_147,,,,,60s,0,0.2501,60s,1s
-cgrates.org,RP1,,,,,,RT_148,*string:~*req.PrefixDestination:148,,,,0s,0.55,0.8867,60s,60s
-cgrates.org,RP1,,,,,,RT_148,,,,,60s,0,0.4434,60s,1s
-cgrates.org,RP1,,,,,,RT_149,*string:~*req.PrefixDestination:149,,,,0s,0.08,0.3675,60s,60s
-cgrates.org,RP1,,,,,,RT_149,,,,,60s,0,0.1837,60s,1s
-cgrates.org,RP1,,,,,,RT_150,*string:~*req.PrefixDestination:150,,,,0s,0.63,0.7551,60s,60s
-cgrates.org,RP1,,,,,,RT_151,*string:~*req.PrefixDestination:151,,,,0s,0.19,0.0796,1s,1s
-cgrates.org,RP1,,,,,,RT_152,*string:~*req.PrefixDestination:152,,,,0s,0.75,0.4678,1s,1s
-cgrates.org,RP1,,,,,,RT_153,*string:~*req.PrefixDestination:153,,,,0s,0.28,0.9489,60s,60s
-cgrates.org,RP1,,,,,,RT_154,*string:~*req.PrefixDestination:154,,,,0s,0.84,0.2815,60s,60s
-cgrates.org,RP1,,,,,,RT_155,*string:~*req.PrefixDestination:155,,,,0s,0.40,0.6686,1s,1s
-cgrates.org,RP1,,,,,,RT_156,*string:~*req.PrefixDestination:156,,,,0s,0.05,0.1175,1s,1s
-cgrates.org,RP1,,,,,,RT_157,*string:~*req.PrefixDestination:157,,,,0s,0.61,0.5358,1s,1s
-cgrates.org,RP1,,,,,,RT_158,*string:~*req.PrefixDestination:158,,,,0s,0.16,0.8607,60s,60s
-cgrates.org,RP1,,,,,,RT_158,,,,,60s,0,0.4303,60s,1s
-cgrates.org,RP1,,,,,,RT_159,*string:~*req.PrefixDestination:159,,,,0s,0.72,0.2478,60s,60s
-cgrates.org,RP1,,,,,,RT_160,*string:~*req.PrefixDestination:160,,,,0s,0.25,0.6975,60s,60s
-cgrates.org,RP1,,,,,,RT_161,*string:~*req.PrefixDestination:161,,,,0s,0.80,0.1133,60s,60s
-cgrates.org,RP1,,,,,,RT_162,*string:~*req.PrefixDestination:162,,,,0s,0.36,0.4376,60s,60s
-cgrates.org,RP1,,,,,,RT_163,*string:~*req.PrefixDestination:163,,,,0s,0.89,0.8174,60s,60s
-cgrates.org,RP1,,,,,,RT_163,,,,,60s,0,0.4087,60s,1s
-cgrates.org,RP1,,,,,,RT_164,*string:~*req.PrefixDestination:164,,,,0s,0.44,0.2670,60s,60s
-cgrates.org,RP1,,,,,,RT_164,,,,,60s,0,0.1335,60s,1s
-cgrates.org,RP1,,,,,,RT_165,*string:~*req.PrefixDestination:165,,,,0s,0.00,0.6847,1s,1s
-cgrates.org,RP1,,,,,,RT_166,*string:~*req.PrefixDestination:166,,,,0s,0.56,0.0094,1s,1s
-cgrates.org,RP1,,,,,,RT_167,*string:~*req.PrefixDestination:167,,,,0s,0.08,0.3963,60s,60s
-cgrates.org,RP1,,,,,,RT_167,,,,,60s,0,0.1982,60s,1s
-cgrates.org,RP1,,,,,,RT_168,*string:~*req.PrefixDestination:168,,,,0s,0.65,0.8463,1s,1s
-cgrates.org,RP1,,,,,,RT_169,*string:~*req.PrefixDestination:169,,,,0s,0.21,0.2648,1s,1s
-cgrates.org,RP1,,,,,,RT_170,*string:~*req.PrefixDestination:170,,,,0s,0.86,0.5905,60s,60s
-cgrates.org,RP1,,,,,,RT_171,*string:~*req.PrefixDestination:171,,,,0s,0.42,0.9778,60s,60s
-cgrates.org,RP1,,,,,,RT_171,,,,,60s,0,0.4889,60s,1s
-cgrates.org,RP1,,,,,,RT_172,*string:~*req.PrefixDestination:172,,,,0s,0.97,0.4273,60s,60s
-cgrates.org,RP1,,,,,,RT_173,*string:~*req.PrefixDestination:173,,,,0s,0.53,0.8537,60s,60s
-cgrates.org,RP1,,,,,,RT_173,,,,,60s,0,0.4269,60s,1s
-cgrates.org,RP1,,,,,,RT_174,*string:~*req.PrefixDestination:174,,,,0s,0.06,0.1779,60s,60s
-cgrates.org,RP1,,,,,,RT_175,*string:~*req.PrefixDestination:175,,,,0s,0.61,0.5646,1s,1s
-cgrates.org,RP1,,,,,,RT_176,*string:~*req.PrefixDestination:176,,,,0s,0.17,0.0144,1s,1s
-cgrates.org,RP1,,,,,,RT_177,*string:~*req.PrefixDestination:177,,,,0s,0.70,0.4329,60s,60s
-cgrates.org,RP1,,,,,,RT_178,*string:~*req.PrefixDestination:178,,,,0s,0.25,0.7576,60s,60s
-cgrates.org,RP1,,,,,,RT_178,,,,,60s,0,0.3788,60s,1s
-cgrates.org,RP1,,,,,,RT_179,*string:~*req.PrefixDestination:179,,,,0s,0.81,0.1499,1s,1s
-cgrates.org,RP1,,,,,,RT_180,*string:~*req.PrefixDestination:180,,,,0s,0.37,0.5996,1s,1s
-cgrates.org,RP1,,,,,,RT_181,*string:~*req.PrefixDestination:181,,,,0s,0.89,0.9870,60s,60s
-cgrates.org,RP1,,,,,,RT_181,,,,,60s,0,0.4935,60s,1s
-cgrates.org,RP1,,,,,,RT_182,*string:~*req.PrefixDestination:182,,,,0s,0.45,0.3348,60s,60s
-cgrates.org,RP1,,,,,,RT_182,,,,,60s,0,0.1674,60s,1s
-cgrates.org,RP1,,,,,,RT_183,*string:~*req.PrefixDestination:183,,,,0s,0.02,0.7215,60s,60s
-cgrates.org,RP1,,,,,,RT_184,*string:~*req.PrefixDestination:184,,,,0s,0.66,0.1708,60s,60s
-cgrates.org,RP1,,,,,,RT_185,*string:~*req.PrefixDestination:185,,,,0s,0.23,0.5584,60s,60s
-cgrates.org,RP1,,,,,,RT_185,,,,,60s,0,0.2792,60s,1s
-cgrates.org,RP1,,,,,,RT_186,*string:~*req.PrefixDestination:186,,,,0s,0.78,0.9143,60s,60s
-cgrates.org,RP1,,,,,,RT_187,*string:~*req.PrefixDestination:187,,,,0s,0.33,0.3012,1s,1s
-cgrates.org,RP1,,,,,,RT_188,*string:~*req.PrefixDestination:188,,,,0s,0.86,0.7522,1s,1s
-cgrates.org,RP1,,,,,,RT_189,*string:~*req.PrefixDestination:189,,,,0s,0.42,0.1394,1s,1s
-cgrates.org,RP1,,,,,,RT_190,*string:~*req.PrefixDestination:190,,,,0s,0.97,0.4955,1s,1s
-cgrates.org,RP1,,,,,,RT_191,*string:~*req.PrefixDestination:191,,,,0s,0.51,0.8824,60s,60s
-cgrates.org,RP1,,,,,,RT_191,,,,,60s,0,0.4412,60s,1s
-cgrates.org,RP1,,,,,,RT_192,*string:~*req.PrefixDestination:192,,,,0s,0.06,0.3393,60s,60s
-cgrates.org,RP1,,,,,,RT_193,*string:~*req.PrefixDestination:193,,,,0s,0.62,0.6639,1s,1s
-cgrates.org,RP1,,,,,,RT_194,*string:~*req.PrefixDestination:194,,,,0s,0.18,0.0824,1s,1s
-cgrates.org,RP1,,,,,,RT_195,*string:~*req.PrefixDestination:195,,,,0s,0.70,0.5322,60s,60s
-cgrates.org,RP1,,,,,,RT_196,*string:~*req.PrefixDestination:196,,,,0s,0.26,0.9193,60s,60s
-cgrates.org,RP1,,,,,,RT_196,,,,,60s,0,0.4597,60s,1s
-cgrates.org,RP1,,,,,,RT_197,*string:~*req.PrefixDestination:197,,,,0s,0.82,0.2411,1s,1s
-cgrates.org,RP1,,,,,,RT_198,*string:~*req.PrefixDestination:198,,,,0s,0.47,0.6596,60s,60s
-cgrates.org,RP1,,,,,,RT_198,,,,,60s,0,0.3298,60s,1s
-cgrates.org,RP1,,,,,,RT_199,*string:~*req.PrefixDestination:199,,,,0s,0.03,0.1095,60s,60s
\ No newline at end of file
diff --git a/data/tariffplans/hundredrates/RatingPlans.csv b/data/tariffplans/hundredrates/RatingPlans.csv
deleted file mode 100644
index 60d0ab5c0..000000000
--- a/data/tariffplans/hundredrates/RatingPlans.csv
+++ /dev/null
@@ -1,102 +0,0 @@
-#Id,DestinationRatesId,Weight
-RP_ANY,DR_100,10
-RP_ANY,DR_101,10
-RP_ANY,DR_102,10
-RP_ANY,DR_103,10
-RP_ANY,DR_104,10
-RP_ANY,DR_105,10
-RP_ANY,DR_106,10
-RP_ANY,DR_107,10
-RP_ANY,DR_108,10
-RP_ANY,DR_109,10
-RP_ANY,DR_110,10
-RP_ANY,DR_111,10
-RP_ANY,DR_112,10
-RP_ANY,DR_113,10
-RP_ANY,DR_114,10
-RP_ANY,DR_115,10
-RP_ANY,DR_116,10
-RP_ANY,DR_117,10
-RP_ANY,DR_118,10
-RP_ANY,DR_119,10
-RP_ANY,DR_120,10
-RP_ANY,DR_121,10
-RP_ANY,DR_122,10
-RP_ANY,DR_123,10
-RP_ANY,DR_124,10
-RP_ANY,DR_125,10
-RP_ANY,DR_126,10
-RP_ANY,DR_127,10
-RP_ANY,DR_128,10
-RP_ANY,DR_129,10
-RP_ANY,DR_130,10
-RP_ANY,DR_131,10
-RP_ANY,DR_132,10
-RP_ANY,DR_133,10
-RP_ANY,DR_134,10
-RP_ANY,DR_135,10
-RP_ANY,DR_136,10
-RP_ANY,DR_137,10
-RP_ANY,DR_138,10
-RP_ANY,DR_139,10
-RP_ANY,DR_140,10
-RP_ANY,DR_141,10
-RP_ANY,DR_142,10
-RP_ANY,DR_143,10
-RP_ANY,DR_144,10
-RP_ANY,DR_145,10
-RP_ANY,DR_146,10
-RP_ANY,DR_147,10
-RP_ANY,DR_148,10
-RP_ANY,DR_149,10
-RP_ANY,DR_150,10
-RP_ANY,DR_151,10
-RP_ANY,DR_152,10
-RP_ANY,DR_153,10
-RP_ANY,DR_154,10
-RP_ANY,DR_155,10
-RP_ANY,DR_156,10
-RP_ANY,DR_157,10
-RP_ANY,DR_158,10
-RP_ANY,DR_159,10
-RP_ANY,DR_160,10
-RP_ANY,DR_161,10
-RP_ANY,DR_162,10
-RP_ANY,DR_163,10
-RP_ANY,DR_164,10
-RP_ANY,DR_165,10
-RP_ANY,DR_166,10
-RP_ANY,DR_167,10
-RP_ANY,DR_168,10
-RP_ANY,DR_169,10
-RP_ANY,DR_170,10
-RP_ANY,DR_171,10
-RP_ANY,DR_172,10
-RP_ANY,DR_173,10
-RP_ANY,DR_174,10
-RP_ANY,DR_175,10
-RP_ANY,DR_176,10
-RP_ANY,DR_177,10
-RP_ANY,DR_178,10
-RP_ANY,DR_179,10
-RP_ANY,DR_180,10
-RP_ANY,DR_181,10
-RP_ANY,DR_182,10
-RP_ANY,DR_183,10
-RP_ANY,DR_184,10
-RP_ANY,DR_185,10
-RP_ANY,DR_186,10
-RP_ANY,DR_187,10
-RP_ANY,DR_188,10
-RP_ANY,DR_189,10
-RP_ANY,DR_190,10
-RP_ANY,DR_191,10
-RP_ANY,DR_192,10
-RP_ANY,DR_193,10
-RP_ANY,DR_194,10
-RP_ANY,DR_195,10
-RP_ANY,DR_196,10
-RP_ANY,DR_197,10
-RP_ANY,DR_198,10
-RP_ANY,DR_199,10
-
diff --git a/data/tariffplans/hundredrates/RatingProfiles.csv b/data/tariffplans/hundredrates/RatingProfiles.csv
deleted file mode 100644
index 924509fd8..000000000
--- a/data/tariffplans/hundredrates/RatingProfiles.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject
-cgrates.org,call,*any,2014-01-14T00:00:00Z,RP_ANY,
-
diff --git a/data/tariffplans/oldaccvsnew/AccountActions.csv b/data/tariffplans/oldaccvsnew/AccountActions.csv
deleted file mode 100644
index 38d1be927..000000000
--- a/data/tariffplans/oldaccvsnew/AccountActions.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
-cgrates.org,1001,AP_PACKAGE_10,,,
-cgrates.org,1002,AP_PACKAGE_11,,,
-cgrates.org,1003,AP_PACKAGE_11,,,
\ No newline at end of file
diff --git a/data/tariffplans/oldaccvsnew/Accounts.csv b/data/tariffplans/oldaccvsnew/Accounts.csv
deleted file mode 100644
index b1f97e5c5..000000000
--- a/data/tariffplans/oldaccvsnew/Accounts.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs
-cgrates.org,1001,*string:~*req.Account:1001,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;0;0,,,
-cgrates.org,1002,*string:~*req.Account:1002,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;;,,RP_ANY,
-cgrates.org,1002,,,,MonetaryBalance,,;10,*concrete,100,,,,,,
-cgrates.org,1003,*string:~*req.Account:1003,,,VoiceBalance,,;10,*abstract,1h,,,*string:~*req.ToR:*voice;1s;;,,,
-cgrates.org,1003,,,,MonetaryBalance,,;10,*concrete,100,,,,,,
diff --git a/data/tariffplans/oldaccvsnew/Chargers.csv b/data/tariffplans/oldaccvsnew/Chargers.csv
deleted file mode 100644
index 65a4d073c..000000000
--- a/data/tariffplans/oldaccvsnew/Chargers.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,RunID,AttributeIDs
-cgrates.org,DEFAULT,,;0,*default,*none
\ No newline at end of file
diff --git a/data/tariffplans/oldaccvsnew/DestinationRates.csv b/data/tariffplans/oldaccvsnew/DestinationRates.csv
deleted file mode 100644
index 1978117eb..000000000
--- a/data/tariffplans/oldaccvsnew/DestinationRates.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy
-DR_ANY,*any,RT_ANY,*up,20,0,
\ No newline at end of file
diff --git a/data/tariffplans/oldaccvsnew/Rates.csv b/data/tariffplans/oldaccvsnew/Rates.csv
deleted file mode 100644
index 9fe61a32d..000000000
--- a/data/tariffplans/oldaccvsnew/Rates.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement
-cgrates.org,RP_ANY,,,,,,RT_ANY,,,,,0s,0,0.2,60s,60s
-cgrates.org,RP_ANY,,,,,,RT_ANY,,,,,60s,0,0.1,60s,1s
\ No newline at end of file
diff --git a/data/tariffplans/oldaccvsnew/RatingProfiles.csv b/data/tariffplans/oldaccvsnew/RatingProfiles.csv
deleted file mode 100644
index 924509fd8..000000000
--- a/data/tariffplans/oldaccvsnew/RatingProfiles.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject
-cgrates.org,call,*any,2014-01-14T00:00:00Z,RP_ANY,
-
diff --git a/data/tariffplans/tp_destination_with_any/AccountActions.csv b/data/tariffplans/tp_destination_with_any/AccountActions.csv
deleted file mode 100644
index 44fa1907f..000000000
--- a/data/tariffplans/tp_destination_with_any/AccountActions.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,Account,ActionPlanId,ActionTriggersId,AllowNegative,Disabled
-cgrates.org,1001,AP_PACKAGE_10,,,
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/ActionPlans.csv b/data/tariffplans/tp_destination_with_any/ActionPlans.csv
deleted file mode 100644
index a55e23b86..000000000
--- a/data/tariffplans/tp_destination_with_any/ActionPlans.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Id,ActionsId,Weight
-AP_PACKAGE_10,ACT_TOPUP_RST_10,10
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/Chargers.csv b/data/tariffplans/tp_destination_with_any/Chargers.csv
deleted file mode 100644
index 65a4d073c..000000000
--- a/data/tariffplans/tp_destination_with_any/Chargers.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,RunID,AttributeIDs
-cgrates.org,DEFAULT,,;0,*default,*none
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/DestinationRates.csv b/data/tariffplans/tp_destination_with_any/DestinationRates.csv
deleted file mode 100644
index 6afb3a053..000000000
--- a/data/tariffplans/tp_destination_with_any/DestinationRates.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-#Id,DestinationId,RatesTag,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy
-DR_1002_1CNT,DST_1002,RT_1CNT,*up,4,0,
-DR_ANY,*any,RT_10CNT,*up,4,0,
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/Destinations.csv b/data/tariffplans/tp_destination_with_any/Destinations.csv
deleted file mode 100644
index dd82a1bfe..000000000
--- a/data/tariffplans/tp_destination_with_any/Destinations.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Id,Prefix
-DST_1002,1002
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/Rates.csv b/data/tariffplans/tp_destination_with_any/Rates.csv
deleted file mode 100644
index 79f5bc2b6..000000000
--- a/data/tariffplans/tp_destination_with_any/Rates.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-#Id,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart
-RT_10CNT,0.2,0.1,60s,60s,0s
-RT_10CNT,0,0.05,60s,1s,60s
-RT_1CNT,0,0.01,60s,60s,0s
\ No newline at end of file
diff --git a/data/tariffplans/tp_destination_with_any/RatingProfiles.csv b/data/tariffplans/tp_destination_with_any/RatingProfiles.csv
deleted file mode 100644
index 460618a59..000000000
--- a/data/tariffplans/tp_destination_with_any/RatingProfiles.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tenant,Category,Subject,ActivationTime,RatingPlanId,RatesFallbackSubject
-cgrates.org,call,1001,2014-01-14T00:00:00Z,RP_1001,
\ No newline at end of file
diff --git a/data/tariffplans/tutaccounts/Accounts.csv b/data/tariffplans/tutaccounts/Accounts.csv
deleted file mode 100644
index dc6548305..000000000
--- a/data/tariffplans/tutaccounts/Accounts.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,Opts,BalanceID,BalanceFilterIDs,BalanceWeights,BalanceType,BalanceUnits,BalanceUnitFactors,BalanceOpts,BalanceCostIncrements,BalanceAttributeIDs,BalanceRateProfileIDs,ThresholdIDs
-cgrates.org,1001,*string:~*req.Account:1001,,,MonetaryBalance1,,;30,*concrete,5,,,*string:~*req.ToR:*voice;1s;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,*none
-cgrates.org,1001,,,,GenericBalance1,,;20,*abstract,1h,*string:~*req.ToR:*data;1.024,,*string:~*req.ToR:*voice;1s;0;0.01;*string:~*req.ToR:*data;1024;0;0.01,,,
-cgrates.org,1001,,,,MonetaryBalance2,,;10,*concrete,3,,,*string:~*req.ToR:*voice;1s;0;1,,,
-cgrates.org,1002,*string:~*req.Account:1002,;10,,MonetaryBalance1,,,*concrete,10,,,*string:~*req.ToR:*voice;1s;0;0.01;;1;0;1,,,*none
diff --git a/data/tariffplans/tutactions/Actions.csv b/data/tariffplans/tutactions/Actions.csv
deleted file mode 100644
index 53ab364bf..000000000
--- a/data/tariffplans/tutactions/Actions.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
-cgrates.org,ONE_TIME_ACT,,;10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
-cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_DATA,,false,0s,*set_balance,,*balance.TestDataBalance.Type,*data
-cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_DATA,,false,0s,*add_balance,,*balance.TestDataBalance.Units,1024
-cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_VOICE,,false,0s,*set_balance,,*balance.TestVoiceBalance.Type,*voice
-cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_VOICE,,false,0s,*add_balance,,*balance.TestVoiceBalance.Units,15m15s
-cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_FILTERS,,false,0s,*set_balance,,*balance.TestVoiceBalance.Filters,*string:~*req.CustomField:500
-cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_REM_VOICE,,false,0s,*rem_balance,,TestVoiceBalance2,
diff --git a/data/tariffplans/tutorial2/AccountActions.csv b/data/tariffplans/tutorial2/AccountActions.csv
deleted file mode 100644
index e2d3dfd29..000000000
--- a/data/tariffplans/tutorial2/AccountActions.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tenant,Account,ActionPlanID,ActionTriggersID,AllowNegative,Disabled
-cgrates.org,1001,STANDARD_PLAN,STANDARD_TRIGGERS,,
-cgrates.org,1002,STANDARD_PLAN,STANDARD_TRIGGERS,,
-cgrates.org,1003,STANDARD_PLAN,STANDARD_TRIGGERS,,
diff --git a/data/tariffplans/tutorial2/Attributes.csv b/data/tariffplans/tutorial2/Attributes.csv
deleted file mode 100644
index 5c492dd98..000000000
--- a/data/tariffplans/tutorial2/Attributes.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tenant,ID,FilterIDs,Weights,AttributeFilterIDs,Path,Type,Value,Blocker
-
-# CRG_RESELLER1 replaces Category->reseller1 and RequestType->*rated for *sessions and *cdrs events
-cgrates.org,ATTR_CRG_SUPPLIER1,*string:~*opts.*context:*sessions|*cdrs,;0,,*req.Category,*constant,reseller1,false
-cgrates.org,ATTR_CRG_SUPPLIER1,,,,*req.RequestType,*constant,*rated,
-
-# ATTR_1001_AUTH returns the Password value for the account 1001 in context <auth>
-cgrates.org,ATTR_1001_AUTH,*string:~*req.Account:1001;*string:~*opts.*context:auth,;20,,*req.Password,*constant,CGRateS.org,false
-
-cgrates.org,ATTR_1002_AUTH,*string:~*req.Account:1002;*string:~*opts.*context:auth,;20,,*req.Password,*constant,CGRateS.org,false
-cgrates.org,ATTR_1003_AUTH,*string:~*req.Account:1003;*string:~*opts.*context:auth,;20,,*req.Password,*constant,CGRateS.org,false
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/Chargers.csv b/data/tariffplans/tutorial2/Chargers.csv
deleted file mode 100644
index 9e1a053d9..000000000
--- a/data/tariffplans/tutorial2/Chargers.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-# Tenant,ID,FilterIDs,Weights,RunID,AttributeIDs
-
-# CGR_DEFAULT is the default charger for events
-cgrates.org,CGR_DEFAULT,,;0,*default,*none
-
-# CGR_RESELLER1 creates an additional CDR for calculating reseller costs
-# uses ATTR_CRG_RESELLER1 to replace Category and RequestType in events
-cgrates.org,CRG_RESELLER1,,;1,reseller1,ATTR_CRG_RESELLER1
diff --git a/data/tariffplans/tutorial2/DestinationRates.csv b/data/tariffplans/tutorial2/DestinationRates.csv
deleted file mode 100644
index d50ab9a2d..000000000
--- a/data/tariffplans/tutorial2/DestinationRates.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-#ID,DestinationsID,RatesID,RoundingMethod,RoundingDecimals,MaxCost,MaxCostStrategy
-DR_10_120C,DST_10,RT_120C,*up,4,,
-DR_10_60C,DST_10,RT_60C,*up,4,,
-DR_2030_120C,DST_2030,RT_120C,*up,4,,
-DR_20_60C,DST_20,RT_60C,*up,4,,
-DR_VOICEMAIL_FREE,DST_VOICEMAIL,RT_0,*up,4,,
-DR_1002_60C,DST_1002,RT_60C,*up,4,,
-DR_ANY_10C_CN,*any,RT_10C_CN,*up,4,,
-DR_ANY_1024_1,*any,RT_1024_1,*up,4,,
-DR_1002_10C1,DST_1002,RT_10C1,*up,4,,
-DR_10_20C1,DST_10,RT_20C1,*up,4,,
-DR_1CNT,*any,RT_1CNT,*up,4,,
-DR_10CNT,*any,RT_10CNT,*up,4,,
\ No newline at end of file
diff --git a/data/tariffplans/tutorial2/Destinations.csv b/data/tariffplans/tutorial2/Destinations.csv
deleted file mode 100644
index fe08093df..000000000
--- a/data/tariffplans/tutorial2/Destinations.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-#ID,Prefix
-DST_10,10
-DST_20,20
-DST_2030,20
-DST_2030,30
-DST_VOICEMAIL,voicemail
-DST_1002,1002
-DST_50,50
diff --git a/data/tariffplans/tutorial2/Rates.csv b/data/tariffplans/tutorial2/Rates.csv
deleted file mode 100644
index 0cc47ee69..000000000
--- a/data/tariffplans/tutorial2/Rates.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-#ID,ConnectFee,Rate,RateUnit,RateIncrement,GroupIntervalStart
-
-# RT_120C charges 0.20 units as connect fee and 1.2 in 1 minute increment in the first minute and second increments after that
-RT_120C,0.2,1.2,1m,1m,0
-RT_120C,,1.2,1m,1s,1m
-
-# RT_60C charges 0.1 connect fee and 0.01 units each second
-RT_60C,0.1,0.01,1s,1s,0
-
-# RT_0 charges 0 units rounding each call per minute
-RT_0,0,0,1m,1m,0
-
-# RT_10C_CN charges 0.1 units as connect/call fee
-RT_10C_CN,0.1,0,0,1s,0
-
-# RT_1024_1 will be used to charge 1 unit per every 1024 of usage in increments of 1024
-RT_1024_1,0,1,1024,1024,0
-
-# RT_10C1 charges 0.1 units of cost every 1 unit of usage
-RT_10C1,0,0.1,1,1,0
-
-# RT_20C1 charges 0.2 units of cost every 1 unit of usage
-RT_20C1,0,0.2,1,1,0
-
-# RT_1CNT charges 0.01 units of cost for each 1s of usage
-RT_1CNT,0,0.01,1s,1s,0
-
-# RT_10CNT charges 0.1 units of cost for each call connected
-RT_10CNT,0.1,0,1s,1s,0
diff --git a/data/tariffplans/tutorial2/RatingProfiles.csv b/data/tariffplans/tutorial2/RatingProfiles.csv
deleted file mode 100644
index 93893aefe..000000000
--- a/data/tariffplans/tutorial2/RatingProfiles.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tenant,Category,Subject,ActivationTime,RatingPlanID,FallbackSubject
-cgrates.org,call,*any,2019-03-01T00:00:00Z,RP_STANDARD,
-cgrates.org,call,1001,2019-03-01T00:00:00Z,RP_1001,*any
-cgrates.org,call,RPF_SPECIAL_BLC,2019-03-01T00:00:00Z,RP_SPECIAL_BLC,
-cgrates.org,data,*any,2019-03-01T00:00:00Z,RP_DATA,
-cgrates.org,sms,*any,2019-03-01T00:00:00Z,RP_SMS,
-
-# reseller1 will pay 0.1 per call, independent of duration
-cgrates.org,reseller1,*any,2019-03-01T00:00:00Z,RP_10CNT,
diff --git a/data/tariffplans/tutorial2/Timings.csv b/data/tariffplans/tutorial2/Timings.csv
deleted file mode 100644
index b0b113a1f..000000000
--- a/data/tariffplans/tutorial2/Timings.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-#ID,Years,Months,MonthDays,WeekDays,Time
-PEAK,*any,*any,*any,1;2;3;4;5,08:00:00
-OFFPEAK_MORNING,*any,*any,*any,1;2;3;4;5,00:00:00
-OFFPEAK_EVENING,*any,*any,*any,1;2;3;4;5,19:00:00
-OFFPEAK_WEEKEND,*any,*any,*any,6;7,00:00:00
-NEW_YEAR,*any,1,1,*any,00:00:00
-TM_NOON,*any,*any,*any,*any,12:00:00
\ No newline at end of file
diff --git a/data/tariffplans/tutrates/Rates.csv b/data/tariffplans/tutrates/Rates.csv
deleted file mode 100644
index 7db298161..000000000
--- a/data/tariffplans/tutrates/Rates.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tenant,ID,FilterIDs,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement
-cgrates.org,RP1,*string:~*req.Subject:1001,;0,0.1,0.6,*free,RT_WEEK,,"* * * * 1-5",;0,false,0s,,0.12,1m,1m
-cgrates.org,RP1,,,,,,RT_WEEK,,,,,1m,,0.6,1m,1s
-cgrates.org,RP1,,,,,,RT_WEEKEND,,"* * * * 0,6",;10,false,0s,,0.06,1m,1s
-cgrates.org,RP1,,,,,,RT_CHRISTMAS,,* * 24 12 *,;30,false,0s,,0.06,1m,1s
\ No newline at end of file
diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go
deleted file mode 100644
index 8efc7940c..000000000
--- a/general_tests/cdrs_internal_it_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-//go:build integration
-// +build integration
-
-/*
-Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
-Copyright (C) ITsysCOM GmbH
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-package general_tests
-
-import (
-	"path"
-	"testing"
-	"time"
-
-	"github.com/cgrates/birpc"
-	"github.com/cgrates/birpc/context"
-	"github.com/cgrates/cgrates/config"
-	"github.com/cgrates/cgrates/engine"
-	"github.com/cgrates/cgrates/utils"
-)
-
-var (
-	cdrsIntCfgPath string
-	cdrsIntCfgDIR  string
-	cdrsIntCfg     *config.CGRConfig
-	cdrsIntRPC     *birpc.Client
-
-	sTestsCdrsInt = []func(t *testing.T){
-		testCdrsIntInitCfg,
-		testCdrsIntStartEngine,
-		testCdrsIntRpcConn,
-		testCdrsIntTestTTL,
-		testCdrsIntStopEngine,
-	}
-)
-
-// This test is valid only for internal
-// to test the ttl for cdrs
-func TestCdrsIntIT(t *testing.T) {
-	switch *dbType {
-	case utils.MetaInternal:
-		cdrsIntCfgDIR = "internal_ttl_internal"
-	case utils.MetaMySQL:
-		t.SkipNow()
-	case utils.MetaMongo:
-		t.SkipNow()
-	case utils.MetaPostgres:
-		t.SkipNow()
-	default:
-		t.Fatal("Unknown Database type")
-	}
-	for _, stest := range sTestsCdrsInt {
-		t.Run(cdrsIntCfgDIR, stest)
-	}
-}
-
-func testCdrsIntInitCfg(t *testing.T) {
-	var err error
-	cdrsIntCfgPath = path.Join(*dataDir, "conf", "samples", cdrsIntCfgDIR)
-	cdrsIntCfg, err = config.NewCGRConfigFromPath(context.Background(), cdrsIntCfgPath)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func testCdrsIntStartEngine(t *testing.T) {
-	if _, err := engine.StopStartEngine(cdrsIntCfgPath, *waitRater); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testCdrsIntRpcConn(t *testing.T) {
-	var err error
-	cdrsIntRPC, err = newRPCClient(cdrsIntCfg.ListenCfg())
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testCdrsIntTestTTL(t *testing.T) {
-	args := &utils.CGREvent{
-		Tenant: "cgrates.org",
-		Event: map[string]interface{}{
-			utils.OriginID:     "testCdrsIntTestTTL",
-			utils.OriginHost:   "192.168.1.1",
-			utils.Source:       "testCdrsIntTestTTL",
-			utils.RequestType:  utils.MetaNone,
-			utils.Category:     "call",
-			utils.AccountField: "testCdrsIntTestTTL",
-			utils.Subject:      "ANY2CNT2",
-			utils.Destination:  "+4986517174963",
-			utils.AnswerTime:   time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC),
-			utils.Usage:        time.Minute,
-		},
-		APIOpts: map[string]interface{}{utils.OptsCDRsStore: true},
-	}
-
-	var reply string
-	if err := cdrsIntRPC.Call(context.Background(), utils.CDRsV1ProcessEvent, args, &reply); err != nil {
-		t.Error("Unexpected error: ", err.Error())
-	} else if reply != utils.OK {
-		t.Error("Unexpected reply received: ", reply)
-	}
-	//commented till we add GetCDRs
-	// var cdrs []*engine.ExternalCDR
-	// if err := cdrsIntRPC.Call(context.Background(), utils.CDRsV1GetCDRs, &utils.RPCCDRsFilter{}, &cdrs); err != nil {
-	// 	t.Fatal("Unexpected error: ", err.Error())
-	// } else if len(cdrs) != 1 {
-	// 	t.Errorf("Expected 1 result received %v ", len(cdrs))
-	// }
-	// time.Sleep(time.Second + 50*time.Millisecond)
-	// if err := cdrsIntRPC.Call(context.Background(), utils.CDRsV1GetCDRs, &utils.RPCCDRsFilter{}, &cdrs); err == nil ||
-	// 	err.Error() != utils.ErrNotFound.Error() {
-	// 	t.Fatal("Unexpected error: ", err)
-	// }
-}
-
-func testCdrsIntStopEngine(t *testing.T) {
-	if err := engine.KillEngine(*waitRater); err != nil {
-		t.Error(err)
-	}
-}