aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--atsc/ca-AB-Calgary15
-rw-r--r--atsc/us-ATSC-center-frequencies-8VSB70
-rw-r--r--atsc/us-CA-SF-Bay-Area16
-rw-r--r--atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256142
-rw-r--r--atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256142
-rw-r--r--atsc/us-Cable-HRC-center-frequencies-QAM256142
-rw-r--r--atsc/us-Cable-IRC-center-frequencies-QAM256142
-rw-r--r--atsc/us-Cable-Standard-center-frequencies-QAM256176
-rw-r--r--atsc/us-ID-Boise8
-rw-r--r--atsc/us-MA-Boston13
-rw-r--r--atsc/us-MI-Lansing7
-rw-r--r--atsc/us-NTSC-center-frequencies-8VSB70
-rw-r--r--atsc/us-PA-Philadelphia16
-rw-r--r--channels-conf/atsc/us-Raleigh-Durham8
-rw-r--r--channels-conf/dvb-s/Astra-19.2E226
-rw-r--r--channels-conf/dvb-s/Astra-28.2E522
-rw-r--r--channels-conf/dvb-s/BrasilSat-B3-84.0W39
-rw-r--r--channels-conf/dvb-t/au-Adelaide28
-rw-r--r--channels-conf/dvb-t/au-Brisbane29
-rw-r--r--channels-conf/dvb-t/au-Hobart18
-rw-r--r--channels-conf/dvb-t/au-Melbourne17
-rw-r--r--channels-conf/dvb-t/cz-Praha16
-rw-r--r--channels-conf/dvb-t/de-Berlin47
-rw-r--r--channels-conf/dvb-t/de-Braunschweig25
-rw-r--r--channels-conf/dvb-t/de-Bremen25
-rw-r--r--channels-conf/dvb-t/de-Koeln-Bonn23
-rw-r--r--channels-conf/dvb-t/de-Leipzig7
-rw-r--r--channels-conf/dvb-t/de-Luebeck22
-rw-r--r--channels-conf/dvb-t/de-Rhein-Main6
-rw-r--r--channels-conf/dvb-t/de-Ruhrgebiet46
-rw-r--r--channels-conf/dvb-t/es-Alpicat19
-rw-r--r--channels-conf/dvb-t/es-Madrid26
-rw-r--r--channels-conf/dvb-t/es-Mussara19
-rw-r--r--channels.conf-dvbc-berlin (renamed from channels-conf/dvb-c/de-Berlin)10
-rw-r--r--channels.conf-dvbs-astra226
-rw-r--r--channels.conf-dvbt-australia (renamed from channels-conf/dvb-t/au-Sydney-NorthShore)62
-rw-r--r--channels.conf-dvbt-berlin51
-rw-r--r--channels.conf-dvbt-collserola (renamed from channels-conf/dvb-t/es-Collserola)16
-rw-r--r--channels.conf-dvbt-crystal-palace (renamed from channels-conf/dvb-t/uk-Crystal-Palace)3
-rw-r--r--channels.conf-dvbt-hannington (renamed from channels-conf/dvb-t/uk-Hannington)0
-rw-r--r--channels.conf-dvbt-madrid16
-rw-r--r--channels.conf-dvbt-oxford (renamed from channels-conf/dvb-t/uk-Oxford)0
-rw-r--r--channels.conf-dvbt-reigate (renamed from channels-conf/dvb-t/uk-Reigate)0
-rw-r--r--channels.conf-dvbt-sandy_heath (renamed from channels-conf/dvb-t/uk-Sandy-Heath)1
-rw-r--r--dvb-c/at-Innsbruck8
-rw-r--r--dvb-c/at-Kabel-Braunau26
-rw-r--r--dvb-c/at-Kabelsignal38
-rw-r--r--dvb-c/at-KarrerNet26
-rw-r--r--dvb-c/at-Liwest31
-rw-r--r--dvb-c/at-SalzburgAG8
-rw-r--r--dvb-c/at-Vienna3
-rw-r--r--dvb-c/be-IN.DI-Integan16
-rw-r--r--dvb-c/br-Net-Digital6
-rw-r--r--dvb-c/ch-Rega-Sense34
-rw-r--r--dvb-c/ch-Video20005
-rw-r--r--dvb-c/ch-Zuerich-cablecom3
-rw-r--r--dvb-c/cz-Moravianet24
-rw-r--r--dvb-c/de-Berlin1
-rw-r--r--dvb-c/de-Brandenburg-Havel30
-rw-r--r--dvb-c/de-Kabel_BW16
-rw-r--r--dvb-c/de-Muenchen27
-rw-r--r--dvb-c/de-Primacom28
-rw-r--r--dvb-c/de-Unitymedia36
-rw-r--r--dvb-c/de-iesy19
-rw-r--r--dvb-c/de-komro-Rosenheim30
-rw-r--r--dvb-c/de-neftv34
-rw-r--r--dvb-c/dk-Aarhus-Antenneforening2
-rw-r--r--dvb-c/dk-Copenhagen-AFDK11
-rw-r--r--dvb-c/dk-Odense10
-rw-r--r--dvb-c/es-Euskaltel19
-rw-r--r--dvb-c/fi-3ktv3
-rw-r--r--dvb-c/fi-HTV4
-rw-r--r--dvb-c/fi-Joensuu-Tikka13
-rw-r--r--dvb-c/fi-TTV4
-rw-r--r--dvb-c/fi-Turku23
-rw-r--r--dvb-c/fi-dna34
-rw-r--r--dvb-c/fi-jkl10
-rw-r--r--dvb-c/fi-sonera12
-rw-r--r--dvb-c/fr-noos-numericable41
-rw-r--r--dvb-c/hu-Digikabel25
-rw-r--r--dvb-c/lu-Ettelbruck-ACE20
-rw-r--r--dvb-c/nl-Delta8
-rw-r--r--dvb-c/nl-REKAM-CAIW_Gouda4
-rw-r--r--dvb-c/nl-Ziggo14
-rw-r--r--dvb-c/nl-Ziggo-Zwolle26
-rw-r--r--dvb-c/no-Oslo-CanalDigital13
-rw-r--r--dvb-c/no-Oslo-Get22
-rw-r--r--dvb-c/se-Gothnet23
-rw-r--r--dvb-c/se-comhem25
-rw-r--r--dvb-h/README3
-rw-r--r--dvb-h/fi-Helsinki2
-rw-r--r--dvb-h/fi-Oulu2
-rw-r--r--dvb-h/fi-Oulu-Nokia-devel4
-rw-r--r--dvb-h/fi-Turku2
-rw-r--r--dvb-s/ABS1-75.0E10
-rw-r--r--dvb-s/AMC1-103w5
-rw-r--r--dvb-s/AMC2-85w6
-rw-r--r--dvb-s/AMC3-87w10
-rw-r--r--dvb-s/AMC4-101w10
-rw-r--r--dvb-s/AMC5-79w5
-rw-r--r--dvb-s/AMC6-72w44
-rw-r--r--dvb-s/AMC9-83w18
-rw-r--r--dvb-s/Agila2_C-146.0E60
-rw-r--r--dvb-s/Amazonas-61.0W54
-rw-r--r--dvb-s/Amos-4w48
-rw-r--r--dvb-s/Anik-F1-107.3W7
-rw-r--r--dvb-s/Apstar6_C-134.0E15
-rw-r--r--dvb-s/AsiaSat2_C-100.5E51
-rw-r--r--dvb-s/AsiaSat3S_C-105.5E102
-rw-r--r--dvb-s/Asiasat4_C-122.2E27
-rw-r--r--dvb-s/Astra-23.5E66
-rw-r--r--dvb-s/Astra-28.2E186
-rw-r--r--dvb-s/Atlantic-Bird-1-12.5W30
-rw-r--r--dvb-s/Atlantic-Bird-3-5.0W4
-rw-r--r--dvb-s/BrasilSat-B1-75.0W11
-rw-r--r--dvb-s/BrasilSat-B2-65.0W34
-rw-r--r--dvb-s/BrasilSat-B3-84.0W85
-rw-r--r--dvb-s/BrasilSat-B4-70.0W39
-rw-r--r--dvb-s/Chinastar1_C-87.5E15
-rw-r--r--dvb-s/Estrela-do-Sul-63.0W27
-rw-r--r--dvb-s/Eurobird1-28.5E5
-rw-r--r--dvb-s/Eurobird9-9.0E16
-rw-r--r--dvb-s/EutelsatW2-16E59
-rw-r--r--dvb-s/Express-3A-11.0W4
-rw-r--r--dvb-s/ExpressAM1-40.0E5
-rw-r--r--dvb-s/ExpressAM2-80.0E35
-rw-r--r--dvb-s/ExpressAM22-53.0E9
-rw-r--r--dvb-s/Galaxy10R-123w10
-rw-r--r--dvb-s/Galaxy11-91w49
-rw-r--r--dvb-s/Galaxy25-97w19
-rw-r--r--dvb-s/Galaxy26-93w58
-rw-r--r--dvb-s/Galaxy27-129w4
-rw-r--r--dvb-s/Galaxy28-89w41
-rw-r--r--dvb-s/Galaxy3C-95w4
-rw-r--r--dvb-s/Hispasat-30.0W37
-rw-r--r--dvb-s/Hotbird-13.0E93
-rw-r--r--dvb-s/IA5-97w18
-rw-r--r--dvb-s/IA6-93w61
-rw-r--r--dvb-s/IA7-129w4
-rw-r--r--dvb-s/IA8-89w34
-rw-r--r--dvb-s/Insat2E_C-83.0E93
-rw-r--r--dvb-s/Insat3A_C-93.5E66
-rw-r--r--dvb-s/Insat4A_C-83.0E93
-rw-r--r--dvb-s/Insat4B_C-93.5E51
-rw-r--r--dvb-s/Intel4-72.0E6
-rw-r--r--dvb-s/Intel904-60.0E13
-rw-r--r--dvb-s/Intelsat-1002-1.0W20
-rw-r--r--dvb-s/Intelsat-11-43.0W4
-rw-r--r--dvb-s/Intelsat-1R-45.0W44
-rw-r--r--dvb-s/Intelsat-3R-43.0W35
-rw-r--r--dvb-s/Intelsat-6B-43.0W17
-rw-r--r--dvb-s/Intelsat-705-50.0W7
-rw-r--r--dvb-s/Intelsat-707-53.0W5
-rw-r--r--dvb-s/Intelsat-805-55.5W67
-rw-r--r--dvb-s/Intelsat-9-58.0W58
-rw-r--r--dvb-s/Intelsat-903-34.5W7
-rw-r--r--dvb-s/Intelsat-905-24.5W9
-rw-r--r--dvb-s/Intelsat-907-27.5W9
-rw-r--r--dvb-s/Intelsat8_C-166.0E39
-rw-r--r--dvb-s/JCSat3A_C-128.0E18
-rw-r--r--dvb-s/Measat3_C-91.5E54
-rw-r--r--dvb-s/NSS-10-37.5W12
-rw-r--r--dvb-s/NSS-7-22.0W25
-rw-r--r--dvb-s/NSS-806-40.5W108
-rw-r--r--dvb-s/Nahuel-1-71.8W11
-rw-r--r--dvb-s/Nilesat101+102-7.0W41
-rw-r--r--dvb-s/OptusC1-156E20
-rw-r--r--dvb-s/OptusD1-160.0E4
-rw-r--r--dvb-s/PalapaC2_C-113.0E39
-rw-r--r--dvb-s/SBS6-74w4
-rw-r--r--dvb-s/ST1_C-80.0E27
-rw-r--r--dvb-s/Satmex-5-116.8W72
-rw-r--r--dvb-s/Satmex-6-113.0W19
-rw-r--r--dvb-s/Sirius-5.0E57
-rw-r--r--dvb-s/Telecom2-8.0W17
-rw-r--r--dvb-s/Telkom1_C-108.0E48
-rw-r--r--dvb-s/Telstar10_C-76.5E63
-rw-r--r--dvb-s/Telstar12-15.0W26
-rw-r--r--dvb-s/Telstar18_C-138.0E18
-rw-r--r--dvb-s/Thaicom1A_C-120.0E24
-rw-r--r--dvb-s/Thaicom2_C-78.5E33
-rw-r--r--dvb-s/Thaicom5_C-78.5E69
-rw-r--r--dvb-s/Thor-1.0W61
-rw-r--r--dvb-s/Turksat-42.0E104
-rw-r--r--dvb-s/Vinasat1_C-132.0E12
-rw-r--r--dvb-s/Yamal201-90.0E48
-rw-r--r--dvb-t/ad-Andorra6
-rw-r--r--dvb-t/at-Official24
-rw-r--r--dvb-t/au-Adelaide14
-rw-r--r--dvb-t/au-AdelaideFoothills12
-rw-r--r--dvb-t/au-Ballarat12
-rw-r--r--dvb-t/au-Bendigo41
-rw-r--r--dvb-t/au-Brisbane14
-rw-r--r--dvb-t/au-Cairns12
-rw-r--r--dvb-t/au-Canberra-Black-Mt12
-rw-r--r--dvb-t/au-Coonabarabran16
-rw-r--r--dvb-t/au-Darwin8
-rw-r--r--dvb-t/au-Devonport19
-rw-r--r--dvb-t/au-FraserCoast-Bundaberg12
-rw-r--r--dvb-t/au-GoldCoast21
-rw-r--r--dvb-t/au-Goulburn-Rocky_Hill19
-rw-r--r--dvb-t/au-Hervey_Bay-Ghost_Hill16
-rw-r--r--dvb-t/au-Hobart12
-rw-r--r--dvb-t/au-Mackay14
-rw-r--r--dvb-t/au-Melbourne-Upwey12
-rw-r--r--dvb-t/au-MidNorthCoast22
-rw-r--r--dvb-t/au-Newcastle12
-rw-r--r--dvb-t/au-Perth12
-rw-r--r--dvb-t/au-Perth_Roleystone12
-rw-r--r--dvb-t/au-SpencerGulf8
-rw-r--r--dvb-t/au-SunshineCoast12
-rw-r--r--dvb-t/au-Sutherland20
-rw-r--r--dvb-t/au-Sydney_Kings_Cross14
-rw-r--r--dvb-t/au-Sydney_North_Shore16
-rw-r--r--dvb-t/au-Tamworth38
-rw-r--r--dvb-t/au-Townsville12
-rw-r--r--dvb-t/au-WaggaWagga12
-rw-r--r--dvb-t/au-Wollongong40
-rw-r--r--dvb-t/au-canberra6
-rw-r--r--dvb-t/au-sydney_north_shore (renamed from dvb-t/au-Melbourne)6
-rw-r--r--dvb-t/auto-Australia110
-rw-r--r--dvb-t/auto-Default65
-rw-r--r--dvb-t/auto-Italy72
-rw-r--r--dvb-t/auto-Taiwan18
-rw-r--r--dvb-t/auto-With167kHzOffsets165
-rw-r--r--dvb-t/ax-Smedsbole13
-rw-r--r--dvb-t/be-All8
-rw-r--r--dvb-t/ch-All32
-rw-r--r--dvb-t/ch-Citycable18
-rw-r--r--dvb-t/ch-Geneva16
-rw-r--r--dvb-t/cz-All41
-rw-r--r--dvb-t/de-Baden-Wuerttemberg19
-rw-r--r--dvb-t/de-Bayern31
-rw-r--r--dvb-t/de-Berlin13
-rw-r--r--dvb-t/de-Brandenburg7
-rw-r--r--dvb-t/de-Bremen9
-rw-r--r--dvb-t/de-Hamburg11
-rw-r--r--dvb-t/de-Hessen19
-rw-r--r--dvb-t/de-Mecklenburg-Vorpommern12
-rw-r--r--dvb-t/de-Niedersachsen29
-rw-r--r--dvb-t/de-Nordrhein-Westfalen23
-rw-r--r--dvb-t/de-Rheinland-Pfalz12
-rw-r--r--dvb-t/de-Saarland7
-rw-r--r--dvb-t/de-Sachsen14
-rw-r--r--dvb-t/de-Sachsen-Anhalt13
-rw-r--r--dvb-t/de-Schleswig-Holstein18
-rw-r--r--dvb-t/de-Thueringen10
-rw-r--r--dvb-t/dk-All23
-rw-r--r--dvb-t/es-Albacete14
-rw-r--r--dvb-t/es-Alfabia11
-rw-r--r--dvb-t/es-Alicante9
-rw-r--r--dvb-t/es-Alpicat8
-rw-r--r--dvb-t/es-Asturias8
-rw-r--r--dvb-t/es-BaixoMinho16
-rw-r--r--dvb-t/es-Bilbao6
-rw-r--r--dvb-t/es-Cadiz8
-rw-r--r--dvb-t/es-Carceres10
-rw-r--r--dvb-t/es-Collserola14
-rw-r--r--dvb-t/es-Donostia13
-rw-r--r--dvb-t/es-Granada8
-rw-r--r--dvb-t/es-Huesca8
-rw-r--r--dvb-t/es-Las_Palmas18
-rw-r--r--dvb-t/es-Lugo9
-rw-r--r--dvb-t/es-Madrid22
-rw-r--r--dvb-t/es-Malaga9
-rw-r--r--dvb-t/es-Muros-Noia9
-rw-r--r--dvb-t/es-Mussara8
-rw-r--r--dvb-t/es-Pamplona9
-rw-r--r--dvb-t/es-Rocacorba6
-rw-r--r--dvb-t/es-SC_Tenerife18
-rw-r--r--dvb-t/es-Santander7
-rw-r--r--dvb-t/es-Santiago_de_Compostela9
-rw-r--r--dvb-t/es-Sevilla23
-rw-r--r--dvb-t/es-Tenerife14
-rw-r--r--dvb-t/es-Valencia9
-rw-r--r--dvb-t/es-Valladolid7
-rw-r--r--dvb-t/es-Vilamarxant4
-rw-r--r--dvb-t/es-Vitoria-Gasteiz8
-rw-r--r--dvb-t/es-Zaragoza7
-rw-r--r--dvb-t/fi-Aanekoski6
-rw-r--r--dvb-t/fi-Aanekoski_Konginkangas6
-rw-r--r--dvb-t/fi-Ahtari4
-rw-r--r--dvb-t/fi-Ala-Vuokki4
-rw-r--r--dvb-t/fi-Alajarvi6
-rw-r--r--dvb-t/fi-Ammansaari4
-rw-r--r--dvb-t/fi-Anjalankoski6
-rw-r--r--dvb-t/fi-Enontekio_Raattama4
-rw-r--r--dvb-t/fi-Espoo5
-rw-r--r--dvb-t/fi-Eurajoki6
-rw-r--r--dvb-t/fi-Fiskars6
-rw-r--r--dvb-t/fi-Haapavesi6
-rw-r--r--dvb-t/fi-Hameenkyro_Kyroskoski6
-rw-r--r--dvb-t/fi-Hameenlinna_Painokangas5
-rw-r--r--dvb-t/fi-Hanko6
-rw-r--r--dvb-t/fi-Hartola5
-rw-r--r--dvb-t/fi-Haukela5
-rw-r--r--dvb-t/fi-Heinavesi5
-rw-r--r--dvb-t/fi-Heinola6
-rw-r--r--dvb-t/fi-Hetta4
-rw-r--r--dvb-t/fi-Hossa4
-rw-r--r--dvb-t/fi-Houtskari6
-rw-r--r--dvb-t/fi-Hyrynsalmi5
-rw-r--r--dvb-t/fi-Hyrynsalmi_Kyparavaara5
-rw-r--r--dvb-t/fi-Hyrynsalmi_Paljakka5
-rw-r--r--dvb-t/fi-Hyvinkaa_Musta-Mannisto6
-rw-r--r--dvb-t/fi-Ii_Raiskio4
-rw-r--r--dvb-t/fi-Iisalmi4
-rw-r--r--dvb-t/fi-Ikaalinen6
-rw-r--r--dvb-t/fi-Ikaalinen_Riitiala6
-rw-r--r--dvb-t/fi-Inari4
-rw-r--r--dvb-t/fi-Inari_Janispaa4
-rw-r--r--dvb-t/fi-Inari_Naatamo4
-rw-r--r--dvb-t/fi-Ivalo_Saarineitamovaara4
-rw-r--r--dvb-t/fi-Jalasjarvi6
-rw-r--r--dvb-t/fi-Jamsa_Kaipola6
-rw-r--r--dvb-t/fi-Jamsa_Kuorevesi_Halli6
-rw-r--r--dvb-t/fi-Jamsa_Matkosvuori6
-rw-r--r--dvb-t/fi-Jamsa_Ouninpohja5
-rw-r--r--dvb-t/fi-Jamsankoski6
-rw-r--r--dvb-t/fi-Joensuu_Vestinkallio5
-rw-r--r--dvb-t/fi-Joroinen_Puukkola-Huutokoski5
-rw-r--r--dvb-t/fi-Joutsa_Lankia6
-rw-r--r--dvb-t/fi-Joutseno6
-rw-r--r--dvb-t/fi-Juntusranta4
-rw-r--r--dvb-t/fi-Juupajoki_Kopsamo5
-rw-r--r--dvb-t/fi-Juva6
-rw-r--r--dvb-t/fi-Jyvaskyla6
-rw-r--r--dvb-t/fi-Kaavi_Luikonlahti5
-rw-r--r--dvb-t/fi-Kajaani_Pollyvaara5
-rw-r--r--dvb-t/fi-Kalajoki5
-rw-r--r--dvb-t/fi-Kangaslampi6
-rw-r--r--dvb-t/fi-Kangasniemi_Turkinmaki6
-rw-r--r--dvb-t/fi-Kankaanpaa6
-rw-r--r--dvb-t/fi-Karigasniemi4
-rw-r--r--dvb-t/fi-Karkkila6
-rw-r--r--dvb-t/fi-Karstula5
-rw-r--r--dvb-t/fi-Karvia5
-rw-r--r--dvb-t/fi-Kaunispaa4
-rw-r--r--dvb-t/fi-Kemijarvi_Suomutunturi4
-rw-r--r--dvb-t/fi-Kerimaki6
-rw-r--r--dvb-t/fi-Keuruu6
-rw-r--r--dvb-t/fi-Keuruu_Haapamaki6
-rw-r--r--dvb-t/fi-Kihnio6
-rw-r--r--dvb-t/fi-Kiihtelysvaara4
-rw-r--r--dvb-t/fi-Kilpisjarvi4
-rw-r--r--dvb-t/fi-Kittila_Sirkka_Levitunturi4
-rw-r--r--dvb-t/fi-Kolari_Vuolittaja4
-rw-r--r--dvb-t/fi-Koli6
-rw-r--r--dvb-t/fi-Korpilahti_Vaarunvuori6
-rw-r--r--dvb-t/fi-Korppoo6
-rw-r--r--dvb-t/fi-Kruunupyy6
-rw-r--r--dvb-t/fi-Kuhmo_Iivantiira5
-rw-r--r--dvb-t/fi-Kuhmo_Lentiira5
-rw-r--r--dvb-t/fi-Kuhmoinen6
-rw-r--r--dvb-t/fi-Kuhmoinen_Harjunsalmi6
-rw-r--r--dvb-t/fi-Kuhmoinen_Puukkoinen5
-rw-r--r--dvb-t/fi-Kuopio6
-rw-r--r--dvb-t/fi-Kustavi_Viherlahti6
-rw-r--r--dvb-t/fi-Kuttanen4
-rw-r--r--dvb-t/fi-Kyyjarvi_Noposenaho5
-rw-r--r--dvb-t/fi-Lahti6
-rw-r--r--dvb-t/fi-Lapua6
-rw-r--r--dvb-t/fi-Laukaa6
-rw-r--r--dvb-t/fi-Laukaa_Vihtavuori6
-rw-r--r--dvb-t/fi-Lavia_Lavianjarvi5
-rw-r--r--dvb-t/fi-Lieksa_Konnanvaara6
-rw-r--r--dvb-t/fi-Lohja6
-rw-r--r--dvb-t/fi-Loimaa6
-rw-r--r--dvb-t/fi-Luhanka6
-rw-r--r--dvb-t/fi-Luopioinen6
-rw-r--r--dvb-t/fi-Mantta6
-rw-r--r--dvb-t/fi-Mantyharju5
-rw-r--r--dvb-t/fi-Mikkeli6
-rw-r--r--dvb-t/fi-Muonio_Olostunturi4
-rw-r--r--dvb-t/fi-Mustasaari3
-rw-r--r--dvb-t/fi-Myllylahti4
-rw-r--r--dvb-t/fi-Nilsia6
-rw-r--r--dvb-t/fi-Nilsia_Keski-Siikajarvi5
-rw-r--r--dvb-t/fi-Nilsia_Pisa5
-rw-r--r--dvb-t/fi-Nokia6
-rw-r--r--dvb-t/fi-Nokia_Siuro_Linnavuori6
-rw-r--r--dvb-t/fi-Nummi-Pusula_Hyonola6
-rw-r--r--dvb-t/fi-Nurmes_Kortevaara5
-rw-r--r--dvb-t/fi-Orivesi_Langelmaki_Talviainen5
-rw-r--r--dvb-t/fi-Oulu6
-rw-r--r--dvb-t/fi-Padasjoki6
-rw-r--r--dvb-t/fi-Padasjoki_Arrakoski6
-rw-r--r--dvb-t/fi-Paltamo_Kivesvaara5
-rw-r--r--dvb-t/fi-Parikkala6
-rw-r--r--dvb-t/fi-Parkano_Sopukallio6
-rw-r--r--dvb-t/fi-Pello4
-rw-r--r--dvb-t/fi-Pello_Ratasvaara4
-rw-r--r--dvb-t/fi-Perho6
-rw-r--r--dvb-t/fi-Pernaja5
-rw-r--r--dvb-t/fi-Pieksamaki_Halkokumpu5
-rw-r--r--dvb-t/fi-Pihtipudas5
-rw-r--r--dvb-t/fi-Porvoo_Suomenkyla6
-rw-r--r--dvb-t/fi-Posio4
-rw-r--r--dvb-t/fi-Pudasjarvi5
-rw-r--r--dvb-t/fi-Pudasjarvi_Hirvaskoski4
-rw-r--r--dvb-t/fi-Pudasjarvi_Iso-Syote5
-rw-r--r--dvb-t/fi-Puolanka6
-rw-r--r--dvb-t/fi-Pyhatunturi4
-rw-r--r--dvb-t/fi-Pyhavuori5
-rw-r--r--dvb-t/fi-Pylkonmaki_Karankajarvi5
-rw-r--r--dvb-t/fi-Raahe_Mestauskallio6
-rw-r--r--dvb-t/fi-Raahe_Piehinki5
-rw-r--r--dvb-t/fi-Ranua_Haasionmaa4
-rw-r--r--dvb-t/fi-Ranua_Leppiaho4
-rw-r--r--dvb-t/fi-Rautavaara_Angervikko6
-rw-r--r--dvb-t/fi-Rautjarvi_Simpele5
-rw-r--r--dvb-t/fi-Ristijarvi5
-rw-r--r--dvb-t/fi-Rovaniemi5
-rw-r--r--dvb-t/fi-Rovaniemi_Ala-Nampa_Yli-Nampa_Rantalaki4
-rw-r--r--dvb-t/fi-Rovaniemi_Kaihuanvaara4
-rw-r--r--dvb-t/fi-Rovaniemi_Marasenkallio4
-rw-r--r--dvb-t/fi-Rovaniemi_Marrasjarvi4
-rw-r--r--dvb-t/fi-Rovaniemi_Meltaus_Sorviselka4
-rw-r--r--dvb-t/fi-Rovaniemi_Sonka4
-rw-r--r--dvb-t/fi-Ruka5
-rw-r--r--dvb-t/fi-Ruovesi_Storminiemi6
-rw-r--r--dvb-t/fi-Saarijarvi6
-rw-r--r--dvb-t/fi-Saarijarvi_Kalmari5
-rw-r--r--dvb-t/fi-Saarijarvi_Mahlu5
-rw-r--r--dvb-t/fi-Salla_Hirvasvaara4
-rw-r--r--dvb-t/fi-Salla_Ihistysjanka4
-rw-r--r--dvb-t/fi-Salla_Naruska4
-rw-r--r--dvb-t/fi-Salla_Sallatunturi4
-rw-r--r--dvb-t/fi-Salla_Sarivaara4
-rw-r--r--dvb-t/fi-Salo_Isokyla6
-rw-r--r--dvb-t/fi-Savukoski_Martti4
-rw-r--r--dvb-t/fi-Savukoski_Tanhua4
-rw-r--r--dvb-t/fi-Siilinjarvi6
-rw-r--r--dvb-t/fi-Sipoo_Norrkulla6
-rw-r--r--dvb-t/fi-Sodankyla_Pittiovaara4
-rw-r--r--dvb-t/fi-Sulkava_Vaatalanmaki5
-rw-r--r--dvb-t/fi-Sysma_Liikola6
-rw-r--r--dvb-t/fi-Taivalkoski4
-rw-r--r--dvb-t/fi-Taivalkoski_Taivalvaara4
-rw-r--r--dvb-t/fi-Tammela6
-rw-r--r--dvb-t/fi-Tammisaari6
-rw-r--r--dvb-t/fi-Tampere6
-rw-r--r--dvb-t/fi-Tampere_Pyynikki6
-rw-r--r--dvb-t/fi-Tervola5
-rw-r--r--dvb-t/fi-Turku5
-rw-r--r--dvb-t/fi-Utsjoki4
-rw-r--r--dvb-t/fi-Utsjoki_Nuorgam_Njallavaara4
-rw-r--r--dvb-t/fi-Utsjoki_Nuorgam_raja4
-rw-r--r--dvb-t/fi-Utsjoki_Nuvvus4
-rw-r--r--dvb-t/fi-Utsjoki_Outakoski4
-rw-r--r--dvb-t/fi-Utsjoki_Polvarniemi4
-rw-r--r--dvb-t/fi-Utsjoki_Rovisuvanto4
-rw-r--r--dvb-t/fi-Utsjoki_Tenola4
-rw-r--r--dvb-t/fi-Uusikaupunki_Orivo6
-rw-r--r--dvb-t/fi-Vaajakoski5
-rw-r--r--dvb-t/fi-Vaala5
-rw-r--r--dvb-t/fi-Vaasa5
-rw-r--r--dvb-t/fi-Valtimo5
-rw-r--r--dvb-t/fi-Vammala_Jyranvuori6
-rw-r--r--dvb-t/fi-Vammala_Roismala5
-rw-r--r--dvb-t/fi-Vammala_Savi5
-rw-r--r--dvb-t/fi-Vantaa_Hakunila6
-rw-r--r--dvb-t/fi-Varpaisjarvi_Honkamaki6
-rw-r--r--dvb-t/fi-Virrat_Lappavuori6
-rw-r--r--dvb-t/fi-Vuokatti6
-rw-r--r--dvb-t/fi-Vuotso4
-rw-r--r--dvb-t/fi-Ylitornio_Ainiovaara5
-rw-r--r--dvb-t/fi-Ylitornio_Raanujarvi4
-rw-r--r--dvb-t/fi-Yllas4
-rw-r--r--dvb-t/fr-Bordeaux9
-rw-r--r--dvb-t/gr-Athens5
-rw-r--r--dvb-t/hk-HongKong18
-rw-r--r--dvb-t/hr-All30
-rw-r--r--dvb-t/hu-Bekescsaba17
-rw-r--r--dvb-t/hu-Budapest17
-rw-r--r--dvb-t/hu-Csavoly-Kiskoros17
-rw-r--r--dvb-t/hu-Gerecse17
-rw-r--r--dvb-t/hu-Gyor-Tatabanya17
-rw-r--r--dvb-t/hu-Kabhegy-Mor-Siofok17
-rw-r--r--dvb-t/hu-Karcag17
-rw-r--r--dvb-t/hu-Kekes-Ozd17
-rw-r--r--dvb-t/hu-Kiskoros17
-rw-r--r--dvb-t/hu-Komadi-Debrecen17
-rw-r--r--dvb-t/hu-Nagykanizsa-Kaposvar17
-rw-r--r--dvb-t/hu-Pecs-Uzd17
-rw-r--r--dvb-t/hu-Salgotarjan17
-rw-r--r--dvb-t/hu-Sopron17
-rw-r--r--dvb-t/hu-Szentes-Szeged17
-rw-r--r--dvb-t/hu-Tokaj-Kazincbarcika17
-rw-r--r--dvb-t/hu-Vasvar17
-rw-r--r--dvb-t/il-All5
-rw-r--r--dvb-t/ir-Tehran4
-rw-r--r--dvb-t/is-Reykjavik29
-rw-r--r--dvb-t/it-Aosta21
-rw-r--r--dvb-t/it-Bari18
-rw-r--r--dvb-t/it-Bologna28
-rw-r--r--dvb-t/it-Bolzano5
-rw-r--r--dvb-t/it-Cagliari23
-rw-r--r--dvb-t/it-Caivano17
-rw-r--r--dvb-t/it-Catania27
-rw-r--r--dvb-t/it-Conero8
-rw-r--r--dvb-t/it-Firenze20
-rw-r--r--dvb-t/it-Genova12
-rw-r--r--dvb-t/it-Livorno15
-rw-r--r--dvb-t/it-Milano49
-rw-r--r--dvb-t/it-Modena50
-rw-r--r--dvb-t/it-Montevergine18
-rw-r--r--dvb-t/it-Pagnacco27
-rw-r--r--dvb-t/it-Palermo23
-rw-r--r--dvb-t/it-Pescara15
-rw-r--r--dvb-t/it-Pisa18
-rw-r--r--dvb-t/it-Roma16
-rw-r--r--dvb-t/it-S-Stefano_al_mare19
-rw-r--r--dvb-t/it-Sassari33
-rw-r--r--dvb-t/it-Torino13
-rw-r--r--dvb-t/it-Trieste23
-rw-r--r--dvb-t/it-Varese16
-rw-r--r--dvb-t/it-Venezia19
-rw-r--r--dvb-t/it-Verona19
-rw-r--r--dvb-t/lt-All39
-rw-r--r--dvb-t/lu-All5
-rw-r--r--dvb-t/lv-Riga25
-rw-r--r--dvb-t/nl-All42
-rw-r--r--dvb-t/no-Trondelag_Stjordal7
-rw-r--r--dvb-t/nz-AucklandInfill10
-rw-r--r--dvb-t/nz-AucklandWaiatarua10
-rw-r--r--dvb-t/nz-Christchurch10
-rw-r--r--dvb-t/nz-Dunedin10
-rw-r--r--dvb-t/nz-Hamilton10
-rw-r--r--dvb-t/nz-HawkesBayMtErin10
-rw-r--r--dvb-t/nz-HawkesBayNapier10
-rw-r--r--dvb-t/nz-Manawatu10
-rw-r--r--dvb-t/nz-Tauranga10
-rw-r--r--dvb-t/nz-Waikato10
-rw-r--r--dvb-t/nz-WellingtonInfill10
-rw-r--r--dvb-t/nz-WellingtonKaukau10
-rw-r--r--dvb-t/nz-WellingtonNgarara10
-rw-r--r--dvb-t/pl-Rzeszow3
-rw-r--r--dvb-t/pl-Warszawa10
-rw-r--r--dvb-t/pl-Wroclaw3
-rw-r--r--dvb-t/ro-Bucharest5
-rw-r--r--dvb-t/se-Alvdalen_Brunnsberg3
-rw-r--r--dvb-t/se-Alvdalsasen3
-rw-r--r--dvb-t/se-Alvsbyn7
-rw-r--r--dvb-t/se-Amot3
-rw-r--r--dvb-t/se-Ange_Snoberg6
-rw-r--r--dvb-t/se-Angebo3
-rw-r--r--dvb-t/se-Angelholm_Vegeholm7
-rw-r--r--dvb-t/se-Arvidsjaur_Jultrask6
-rw-r--r--dvb-t/se-Aspeboda3
-rw-r--r--dvb-t/se-Atvidaberg4
-rw-r--r--dvb-t/se-Avesta_Krylbo4
-rw-r--r--dvb-t/se-Backefors7
-rw-r--r--dvb-t/se-Bankeryd4
-rw-r--r--dvb-t/se-Bergsjo_Balleberget3
-rw-r--r--dvb-t/se-Bergvik3
-rw-r--r--dvb-t/se-Bollebygd4
-rw-r--r--dvb-t/se-Bollnas6
-rw-r--r--dvb-t/se-Boras_Dalsjofors7
-rw-r--r--dvb-t/se-Boras_Sjobo4
-rw-r--r--dvb-t/se-Borlange_Idkerberget6
-rw-r--r--dvb-t/se-Borlange_Nygardarna4
-rw-r--r--dvb-t/se-Bottnaryd_Ryd3
-rw-r--r--dvb-t/se-Bromsebro4
-rw-r--r--dvb-t/se-Bruzaholm3
-rw-r--r--dvb-t/se-Byxelkrok4
-rw-r--r--dvb-t/se-Dadran3
-rw-r--r--dvb-t/se-Dalfors3
-rw-r--r--dvb-t/se-Dalstuga3
-rw-r--r--dvb-t/se-Degerfors6
-rw-r--r--dvb-t/se-Delary3
-rw-r--r--dvb-t/se-Djura3
-rw-r--r--dvb-t/se-Drevdagen3
-rw-r--r--dvb-t/se-Duvnas3
-rw-r--r--dvb-t/se-Duvnas_Basna3
-rw-r--r--dvb-t/se-Edsbyn3
-rw-r--r--dvb-t/se-Emmaboda_Balshult6
-rw-r--r--dvb-t/se-Enviken4
-rw-r--r--dvb-t/se-Fagersta4
-rw-r--r--dvb-t/se-Falerum_Centrum3
-rw-r--r--dvb-t/se-Falun_Lovberget6
-rw-r--r--dvb-t/se-Farila3
-rw-r--r--dvb-t/se-Faro_Ajkerstrask4
-rw-r--r--dvb-t/se-Farosund_Bunge7
-rw-r--r--dvb-t/se-Filipstad_Klockarhojden6
-rw-r--r--dvb-t/se-Finnveden6
-rw-r--r--dvb-t/se-Fredriksberg3
-rw-r--r--dvb-t/se-Fritsla3
-rw-r--r--dvb-t/se-Furudal3
-rw-r--r--dvb-t/se-Gallivare6
-rw-r--r--dvb-t/se-Garpenberg_Kuppgarden3
-rw-r--r--dvb-t/se-Gavle_Skogmur6
-rw-r--r--dvb-t/se-Gnarp3
-rw-r--r--dvb-t/se-Gnesta4
-rw-r--r--dvb-t/se-Gnosjo_Marieholm3
-rw-r--r--dvb-t/se-Goteborg_Brudaremossen7
-rw-r--r--dvb-t/se-Goteborg_Slattadamm7
-rw-r--r--dvb-t/se-Gullbrandstorp3
-rw-r--r--dvb-t/se-Gunnarsbo3
-rw-r--r--dvb-t/se-Gusum3
-rw-r--r--dvb-t/se-Hagfors_Varmullsasen6
-rw-r--r--dvb-t/se-Hallaryd3
-rw-r--r--dvb-t/se-Hallbo3
-rw-r--r--dvb-t/se-Halmstad_Hamnen4
-rw-r--r--dvb-t/se-Halmstad_Oskarstrom6
-rw-r--r--dvb-t/se-Harnosand_Harnon6
-rw-r--r--dvb-t/se-Hassela3
-rw-r--r--dvb-t/se-Havdhem7
-rw-r--r--dvb-t/se-Hedemora3
-rw-r--r--dvb-t/se-Helsingborg_Olympia7
-rw-r--r--dvb-t/se-Hennan3
-rw-r--r--dvb-t/se-Hestra_Aspas3
-rw-r--r--dvb-t/se-Hjo_Grevback3
-rw-r--r--dvb-t/se-Hofors6
-rw-r--r--dvb-t/se-Hogfors3
-rw-r--r--dvb-t/se-Hogsby_Virstad4
-rw-r--r--dvb-t/se-Holsbybrunn_Holsbyholm3
-rw-r--r--dvb-t/se-Horby_Sallerup9
-rw-r--r--dvb-t/se-Horken3
-rw-r--r--dvb-t/se-Hudiksvall_Forsa6
-rw-r--r--dvb-t/se-Hudiksvall_Galgberget4
-rw-r--r--dvb-t/se-Huskvarna3
-rw-r--r--dvb-t/se-Idre3
-rw-r--r--dvb-t/se-Ingatorp3
-rw-r--r--dvb-t/se-Ingvallsbenning3
-rw-r--r--dvb-t/se-Irevik4
-rw-r--r--dvb-t/se-Jamjo4
-rw-r--r--dvb-t/se-Jarnforsen3
-rw-r--r--dvb-t/se-Jarvso3
-rw-r--r--dvb-t/se-Jokkmokk_Tjalmejaure6
-rw-r--r--dvb-t/se-Jonkoping_Bondberget6
-rw-r--r--dvb-t/se-Kalix6
-rw-r--r--dvb-t/se-Karbole3
-rw-r--r--dvb-t/se-Karlsborg_Vaberget3
-rw-r--r--dvb-t/se-Karlshamn6
-rw-r--r--dvb-t/se-Karlskrona_Vamo6
-rw-r--r--dvb-t/se-Karlstad_Sormon9
-rw-r--r--dvb-t/se-Kaxholmen_Vistakulle3
-rw-r--r--dvb-t/se-Kinnastrom3
-rw-r--r--dvb-t/se-Kiruna_Kirunavaara6
-rw-r--r--dvb-t/se-Kisa7
-rw-r--r--dvb-t/se-Knared3
-rw-r--r--dvb-t/se-Kopmanholmen6
-rw-r--r--dvb-t/se-Kopparberg4
-rw-r--r--dvb-t/se-Kramfors_Lugnvik6
-rw-r--r--dvb-t/se-Kristinehamn_Utsiktsberget6
-rw-r--r--dvb-t/se-Kungsater3
-rw-r--r--dvb-t/se-Kungsberget_GI3
-rw-r--r--dvb-t/se-Langshyttan3
-rw-r--r--dvb-t/se-Langshyttan_Engelsfors3
-rw-r--r--dvb-t/se-Leksand_Karingberget3
-rw-r--r--dvb-t/se-Lerdala3
-rw-r--r--dvb-t/se-Lilltjara_Digerberget3
-rw-r--r--dvb-t/se-Limedsforsen3
-rw-r--r--dvb-t/se-Lindshammar_Ramkvilla3
-rw-r--r--dvb-t/se-Linkoping_Vattentornet7
-rw-r--r--dvb-t/se-Ljugarn4
-rw-r--r--dvb-t/se-Loffstrand6
-rw-r--r--dvb-t/se-Lonneberga4
-rw-r--r--dvb-t/se-Lorstrand3
-rw-r--r--dvb-t/se-Ludvika_Bjorkasen4
-rw-r--r--dvb-t/se-Lumsheden_Trekanten3
-rw-r--r--dvb-t/se-Lycksele_Knaften6
-rw-r--r--dvb-t/se-Mahult3
-rw-r--r--dvb-t/se-Malmo_Jagersro7
-rw-r--r--dvb-t/se-Malung4
-rw-r--r--dvb-t/se-Mariannelund3
-rw-r--r--dvb-t/se-Markaryd_Hualtet4
-rw-r--r--dvb-t/se-Matfors6
-rw-r--r--dvb-t/se-Molndal_Vasterberget7
-rw-r--r--dvb-t/se-Mora_Eldris6
-rw-r--r--dvb-t/se-Motala_Ervasteby7
-rw-r--r--dvb-t/se-Mullsjo_Torestorp4
-rw-r--r--dvb-t/se-Nassjo6
-rw-r--r--dvb-t/se-Navekvarn3
-rw-r--r--dvb-t/se-Norrahammar3
-rw-r--r--dvb-t/se-Norrkoping_Krokek7
-rw-r--r--dvb-t/se-Norrtalje_Sodra_Bergen7
-rw-r--r--dvb-t/se-Nykoping3
-rw-r--r--dvb-t/se-Orebro_Lockhyttan7
-rw-r--r--dvb-t/se-Ornskoldsvik_As7
-rw-r--r--dvb-t/se-Oskarshamn6
-rw-r--r--dvb-t/se-Ostersund_Brattasen7
-rw-r--r--dvb-t/se-Osthammar_Valo7
-rw-r--r--dvb-t/se-Overkalix6
-rw-r--r--dvb-t/se-Oxberg3
-rw-r--r--dvb-t/se-Pajala6
-rw-r--r--dvb-t/se-Paulistom3
-rw-r--r--dvb-t/se-Rattvik3
-rw-r--r--dvb-t/se-Rengsjo3
-rw-r--r--dvb-t/se-Rorbacksnas3
-rw-r--r--dvb-t/se-Sagmyra3
-rw-r--r--dvb-t/se-Salen3
-rw-r--r--dvb-t/se-Salfjallet3
-rw-r--r--dvb-t/se-Sarna_Mickeltemplet3
-rw-r--r--dvb-t/se-Satila3
-rw-r--r--dvb-t/se-Saxdalen3
-rw-r--r--dvb-t/se-Siljansnas_Uvberget3
-rw-r--r--dvb-t/se-Skarstad3
-rw-r--r--dvb-t/se-Skattungbyn3
-rw-r--r--dvb-t/se-Skelleftea7
-rw-r--r--dvb-t/se-Skene_Nycklarberget3
-rw-r--r--dvb-t/se-Skovde7
-rw-r--r--dvb-t/se-Smedjebacken_Uvberget6
-rw-r--r--dvb-t/se-Soderhamn4
-rw-r--r--dvb-t/se-Soderkoping4
-rw-r--r--dvb-t/se-Sodertalje_Ragnhildsborg8
-rw-r--r--dvb-t/se-Solleftea_Hallsta6
-rw-r--r--dvb-t/se-Solleftea_Multra6
-rw-r--r--dvb-t/se-Sorsjon3
-rw-r--r--dvb-t/se-Stockholm_Marieberg7
-rw-r--r--dvb-t/se-Stockholm_Nacka8
-rw-r--r--dvb-t/se-Stora_Skedvi3
-rw-r--r--dvb-t/se-Storfjaten3
-rw-r--r--dvb-t/se-Storuman6
-rw-r--r--dvb-t/se-Stromstad7
-rw-r--r--dvb-t/se-Styrsjobo3
-rw-r--r--dvb-t/se-Sundborn3
-rw-r--r--dvb-t/se-Sundsbruk6
-rw-r--r--dvb-t/se-Sundsvall_S_Stadsberget7
-rw-r--r--dvb-t/se-Sunne_Blabarskullen6
-rw-r--r--dvb-t/se-Svartnas3
-rw-r--r--dvb-t/se-Sveg_Brickan6
-rw-r--r--dvb-t/se-Taberg3
-rw-r--r--dvb-t/se-Tandadalen3
-rw-r--r--dvb-t/se-Tasjo6
-rw-r--r--dvb-t/se-Tollsjo3
-rw-r--r--dvb-t/se-Torsby_Bada6
-rw-r--r--dvb-t/se-Tranas_Bredkarr4
-rw-r--r--dvb-t/se-Tranemo3
-rw-r--r--dvb-t/se-Transtrand_Bolheden4
-rw-r--r--dvb-t/se-Traryd_Betas4
-rw-r--r--dvb-t/se-Trollhattan7
-rw-r--r--dvb-t/se-Trosa4
-rw-r--r--dvb-t/se-Tystberga3
-rw-r--r--dvb-t/se-Uddevalla_Herrestad7
-rw-r--r--dvb-t/se-Ullared3
-rw-r--r--dvb-t/se-Ulricehamn4
-rw-r--r--dvb-t/se-Ulvshyttan_Porjus3
-rw-r--r--dvb-t/se-Uppsala_Rickomberga3
-rw-r--r--dvb-t/se-Uppsala_Vedyxa7
-rw-r--r--dvb-t/se-Vaddo_Elmsta4
-rw-r--r--dvb-t/se-Valdemarsvik4
-rw-r--r--dvb-t/se-Vannas_Granlundsberget6
-rw-r--r--dvb-t/se-Vansbro_Hummelberget3
-rw-r--r--dvb-t/se-Varberg_Grimeton6
-rw-r--r--dvb-t/se-Vasteras_Lillharad7
-rw-r--r--dvb-t/se-Vastervik_Farhult6
-rw-r--r--dvb-t/se-Vaxbo3
-rw-r--r--dvb-t/se-Vessigebro3
-rw-r--r--dvb-t/se-Vetlanda_Nye3
-rw-r--r--dvb-t/se-Vikmanshyttan3
-rw-r--r--dvb-t/se-Virserum6
-rw-r--r--dvb-t/se-Visby_Follingbo7
-rw-r--r--dvb-t/se-Visby_Hamnen7
-rw-r--r--dvb-t/se-Visingso3
-rw-r--r--dvb-t/se-Vislanda_Nydala6
-rw-r--r--dvb-t/se-Voxna3
-rw-r--r--dvb-t/se-Ystad_Metallgatan7
-rw-r--r--dvb-t/se-Yttermalung3
-rw-r--r--dvb-t/si-Ljubljana5
-rw-r--r--dvb-t/sk-BanskaBystrica9
-rw-r--r--dvb-t/sk-BanskaStiavnica9
-rw-r--r--dvb-t/sk-Bardejov9
-rw-r--r--dvb-t/sk-Bratislava9
-rw-r--r--dvb-t/sk-Cadca9
-rw-r--r--dvb-t/sk-Detva9
-rw-r--r--dvb-t/sk-Hnusta9
-rw-r--r--dvb-t/sk-Kosice9
-rw-r--r--dvb-t/sk-KralovskyChlmec9
-rw-r--r--dvb-t/sk-Krompachy9
-rw-r--r--dvb-t/sk-Lucenec9
-rw-r--r--dvb-t/sk-Medzev9
-rw-r--r--dvb-t/sk-Namestovo9
-rw-r--r--dvb-t/sk-Nitra9
-rw-r--r--dvb-t/sk-Poprad10
-rw-r--r--dvb-t/sk-PovazskaBystrica9
-rw-r--r--dvb-t/sk-Presov9
-rw-r--r--dvb-t/sk-Prievidza9
-rw-r--r--dvb-t/sk-Revuca9
-rw-r--r--dvb-t/sk-Roznava9
-rw-r--r--dvb-t/sk-Ruzomberok9
-rw-r--r--dvb-t/sk-Snina9
-rw-r--r--dvb-t/sk-StaraLubovna9
-rw-r--r--dvb-t/sk-Sturovo9
-rw-r--r--dvb-t/sk-Trencin9
-rw-r--r--dvb-t/sk-Zilina9
-rw-r--r--dvb-t/tw-Kaohsiung6
-rw-r--r--dvb-t/tw-Taipei7
-rw-r--r--dvb-t/uk-Aberdare15
-rw-r--r--dvb-t/uk-Angus10
-rw-r--r--dvb-t/uk-BeaconHill10
-rw-r--r--dvb-t/uk-Belmont10
-rw-r--r--dvb-t/uk-Bilsdale10
-rw-r--r--dvb-t/uk-BlackHill11
-rw-r--r--dvb-t/uk-Blaenplwyf10
-rw-r--r--dvb-t/uk-BluebellHill10
-rw-r--r--dvb-t/uk-Bressay10
-rw-r--r--dvb-t/uk-BrierleyHill10
-rw-r--r--dvb-t/uk-BristolIlchesterCres10
-rw-r--r--dvb-t/uk-BristolKingsWeston10
-rw-r--r--dvb-t/uk-Bromsgrove10
-rw-r--r--dvb-t/uk-BrougherMountain10
-rw-r--r--dvb-t/uk-Caldbeck10
-rw-r--r--dvb-t/uk-CaradonHill10
-rw-r--r--dvb-t/uk-Carmel10
-rw-r--r--dvb-t/uk-Chatton10
-rw-r--r--dvb-t/uk-Chesterfield10
-rw-r--r--dvb-t/uk-Craigkelly10
-rw-r--r--dvb-t/uk-CrystalPalace11
-rw-r--r--dvb-t/uk-Darvel10
-rw-r--r--dvb-t/uk-Divis10
-rw-r--r--dvb-t/uk-Dover14
-rw-r--r--dvb-t/uk-Durris10
-rw-r--r--dvb-t/uk-Eitshal10
-rw-r--r--dvb-t/uk-EmleyMoor10
-rw-r--r--dvb-t/uk-Fenham10
-rw-r--r--dvb-t/uk-Fenton10
-rw-r--r--dvb-t/uk-Ferryside8
-rw-r--r--dvb-t/uk-Guildford10
-rw-r--r--dvb-t/uk-Hannington9
-rw-r--r--dvb-t/uk-Hastings10
-rw-r--r--dvb-t/uk-Heathfield10
-rw-r--r--dvb-t/uk-HemelHempstead10
-rw-r--r--dvb-t/uk-HuntshawCross13
-rw-r--r--dvb-t/uk-Idle10
-rw-r--r--dvb-t/uk-KeelylangHill10
-rw-r--r--dvb-t/uk-Keighley10
-rw-r--r--dvb-t/uk-KilveyHill10
-rw-r--r--dvb-t/uk-KnockMore10
-rw-r--r--dvb-t/uk-Lancaster10
-rw-r--r--dvb-t/uk-LarkStoke10
-rw-r--r--dvb-t/uk-Limavady10
-rw-r--r--dvb-t/uk-Llanddona10
-rw-r--r--dvb-t/uk-Malvern10
-rw-r--r--dvb-t/uk-Mendip10
-rw-r--r--dvb-t/uk-Midhurst10
-rw-r--r--dvb-t/uk-Moel-y-Parc10
-rw-r--r--dvb-t/uk-Nottingham10
-rw-r--r--dvb-t/uk-OliversMount10
-rw-r--r--dvb-t/uk-Oxford29
-rw-r--r--dvb-t/uk-PendleForest10
-rw-r--r--dvb-t/uk-Plympton10
-rw-r--r--dvb-t/uk-PontopPike11
-rw-r--r--dvb-t/uk-Pontypool10
-rw-r--r--dvb-t/uk-Presely10
-rw-r--r--dvb-t/uk-Redruth14
-rw-r--r--dvb-t/uk-Reigate11
-rw-r--r--dvb-t/uk-RidgeHill10
-rw-r--r--dvb-t/uk-Rosemarkie10
-rw-r--r--dvb-t/uk-Rosneath10
-rw-r--r--dvb-t/uk-Rowridge11
-rw-r--r--dvb-t/uk-RumsterForest10
-rw-r--r--dvb-t/uk-Saddleworth10
-rw-r--r--dvb-t/uk-Salisbury10
-rw-r--r--dvb-t/uk-SandyHeath11
-rw-r--r--dvb-t/uk-Selkirk10
-rw-r--r--dvb-t/uk-Sheffield10
-rw-r--r--dvb-t/uk-StocklandHill9
-rw-r--r--dvb-t/uk-Storeton14
-rw-r--r--dvb-t/uk-Sudbury12
-rw-r--r--dvb-t/uk-SuttonColdfield10
-rw-r--r--dvb-t/uk-Tacolneston10
-rw-r--r--dvb-t/uk-TheWrekin15
-rw-r--r--dvb-t/uk-Torosay10
-rw-r--r--dvb-t/uk-TunbridgeWells10
-rw-r--r--dvb-t/uk-Waltham10
-rw-r--r--dvb-t/uk-Wenvoe10
-rw-r--r--dvb-t/uk-WhitehawkHill10
-rw-r--r--dvb-t/uk-WinterHill10
-rw-r--r--dvb-t/vn-Hanoi5
-rw-r--r--dvb-t/vn-Thaibinh5
872 files changed, 395 insertions, 12134 deletions
diff --git a/atsc/ca-AB-Calgary b/atsc/ca-AB-Calgary
deleted file mode 100644
index 526fcc55..00000000
--- a/atsc/ca-AB-Calgary
+++ /dev/null
@@ -1,15 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20110502 1 0 ATSC CA </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Calgary AB, Canada OTA
-# date (yyyy-mm-dd) : 2011-06-17
-# provided by (opt) : shadowofdarkness@gmail.com
-#
-# A[2] <freq> <mod> [# comment]
-#------------------------------------------------------------------------------
-A 515000000 8VSB
-A 563000000 8VSB
-A 635000000 8VSB
-A 683000000 8VSB
diff --git a/atsc/us-ATSC-center-frequencies-8VSB b/atsc/us-ATSC-center-frequencies-8VSB
deleted file mode 100644
index 2e39de15..00000000
--- a/atsc/us-ATSC-center-frequencies-8VSB
+++ /dev/null
@@ -1,70 +0,0 @@
-# US ATSC center frequencies, use if in doubt
-
-A 57028615 8VSB
-A 63028615 8VSB
-A 69028615 8VSB
-A 79028615 8VSB
-A 85028615 8VSB
-A 177028615 8VSB
-A 183028615 8VSB
-A 189028615 8VSB
-A 195028615 8VSB
-A 201028615 8VSB
-A 207028615 8VSB
-A 213028615 8VSB
-A 473028615 8VSB
-A 479028615 8VSB
-A 485028615 8VSB
-A 491028615 8VSB
-A 497028615 8VSB
-A 503028615 8VSB
-A 509028615 8VSB
-A 515028615 8VSB
-A 521028615 8VSB
-A 527028615 8VSB
-A 533028615 8VSB
-A 539028615 8VSB
-A 545028615 8VSB
-A 551028615 8VSB
-A 557028615 8VSB
-A 563028615 8VSB
-A 569028615 8VSB
-A 575028615 8VSB
-A 581028615 8VSB
-A 587028615 8VSB
-A 593028615 8VSB
-A 599028615 8VSB
-A 605028615 8VSB
-A 611028615 8VSB
-A 617028615 8VSB
-A 623028615 8VSB
-A 629028615 8VSB
-A 635028615 8VSB
-A 641028615 8VSB
-A 647028615 8VSB
-A 653028615 8VSB
-A 659028615 8VSB
-A 665028615 8VSB
-A 671028615 8VSB
-A 677028615 8VSB
-A 683028615 8VSB
-A 689028615 8VSB
-A 695028615 8VSB
-A 701028615 8VSB
-A 707028615 8VSB
-A 713028615 8VSB
-A 719028615 8VSB
-A 725028615 8VSB
-A 731028615 8VSB
-A 737028615 8VSB
-A 743028615 8VSB
-A 749028615 8VSB
-A 755028615 8VSB
-A 761028615 8VSB
-A 767028615 8VSB
-A 773028615 8VSB
-A 779028615 8VSB
-A 785028615 8VSB
-A 791028615 8VSB
-A 797028615 8VSB
-A 803028615 8VSB
diff --git a/atsc/us-CA-SF-Bay-Area b/atsc/us-CA-SF-Bay-Area
deleted file mode 100644
index 8cca4e02..00000000
--- a/atsc/us-CA-SF-Bay-Area
+++ /dev/null
@@ -1,16 +0,0 @@
-# initial tuning data for some frequencies of for the San Francisco Bay Area
-# includes San Francisco, San Jose, Oakland...
-
-A 503000000 8VSB
-A 551000000 8VSB
-A 563000000 8VSB
-A 593000000 8VSB
-A 623000000 8VSB
-A 635000000 8VSB
-A 647000000 8VSB
-A 659000000 8VSB
-A 683000000 8VSB
-A 689000000 8VSB
-A 701000000 8VSB
-A 725000000 8VSB
-A 731000000 8VSB
diff --git a/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256 b/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
deleted file mode 100644
index c0afed99..00000000
--- a/atsc/us-Cable-EIA-542-HRC-center-frequencies-QAM256
+++ /dev/null
@@ -1,142 +0,0 @@
-# US EIA-542 Cable center frequencies
-# Harmonically Related Carriers (HRC)
-# Channels 1 to 125 are in ascending EIA/NCTA channel designation order
-
-#1
-A 73753600 QAM256
-A 55752700 QAM256
-A 61753000 QAM256
-A 67753300 QAM256
-A 77753900 QAM256
-A 83754200 QAM256
-A 175758700 QAM256
-A 181759000 QAM256
-A 187759300 QAM256
-#10
-A 193759600 QAM256
-A 199759900 QAM256
-A 205760200 QAM256
-A 211760500 QAM256
-A 121756000 QAM256
-A 127756300 QAM256
-A 133756600 QAM256
-A 139756900 QAM256
-A 145757200 QAM256
-A 151757500 QAM256
-#20
-A 157757800 QAM256
-A 163758100 QAM256
-A 169758400 QAM256
-A 217760800 QAM256
-A 223761100 QAM256
-A 229761400 QAM256
-A 235761700 QAM256
-A 241762000 QAM256
-A 247762300 QAM256
-A 253762600 QAM256
-#30
-A 259762900 QAM256
-A 265763200 QAM256
-A 271763500 QAM256
-A 277763800 QAM256
-A 283764100 QAM256
-A 289764400 QAM256
-A 295764700 QAM256
-A 301765000 QAM256
-A 307765300 QAM256
-A 313765600 QAM256
-#40
-A 319765900 QAM256
-A 325766200 QAM256
-A 331766500 QAM256
-A 337766800 QAM256
-A 343767100 QAM256
-A 349767400 QAM256
-A 355767700 QAM256
-A 361768000 QAM256
-A 367768300 QAM256
-A 373768600 QAM256
-#50
-A 379768900 QAM256
-A 385769200 QAM256
-A 391769500 QAM256
-A 397769800 QAM256
-A 403770100 QAM256
-A 409770400 QAM256
-A 415770700 QAM256
-A 421771000 QAM256
-A 427771300 QAM256
-A 433771600 QAM256
-#60
-A 439771900 QAM256
-A 445772200 QAM256
-A 451772500 QAM256
-A 457772800 QAM256
-A 463773100 QAM256
-A 469773400 QAM256
-A 475773700 QAM256
-A 481774000 QAM256
-A 487774300 QAM256
-A 493774600 QAM256
-#70
-A 499774900 QAM256
-A 505775200 QAM256
-A 511775500 QAM256
-A 517775800 QAM256
-A 523776100 QAM256
-A 529776400 QAM256
-A 535776700 QAM256
-A 541777000 QAM256
-A 547777300 QAM256
-A 553777600 QAM256
-#80
-A 559777900 QAM256
-A 565778200 QAM256
-A 571778500 QAM256
-A 577778800 QAM256
-A 583779100 QAM256
-A 589779400 QAM256
-A 595779700 QAM256
-A 601780000 QAM256
-A 607780300 QAM256
-A 613780600 QAM256
-#90
-A 619780900 QAM256
-A 625781200 QAM256
-A 631781500 QAM256
-A 637781800 QAM256
-A 643782100 QAM256
-A 91754500 QAM256
-A 97754800 QAM256
-A 103755100 QAM256
-A 109775000 QAM256
-A 115775000 QAM256
-#100
-A 649782400 QAM256
-A 655782700 QAM256
-A 661783000 QAM256
-A 667783300 QAM256
-A 673783600 QAM256
-A 679783900 QAM256
-A 685784200 QAM256
-A 691784500 QAM256
-A 697784800 QAM256
-A 703785100 QAM256
-#110
-A 709785400 QAM256
-A 715785700 QAM256
-A 721786000 QAM256
-A 727786300 QAM256
-A 733786600 QAM256
-A 739786900 QAM256
-A 745787200 QAM256
-A 751787500 QAM256
-A 757787800 QAM256
-A 763788100 QAM256
-#120
-A 769788400 QAM256
-A 775788700 QAM256
-A 781789000 QAM256
-A 787789300 QAM256
-A 793789600 QAM256
-A 799789900 QAM256
diff --git a/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256 b/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256
deleted file mode 100644
index f18d5e53..00000000
--- a/atsc/us-Cable-EIA-542-IRC-center_frequencies-QAM256
+++ /dev/null
@@ -1,142 +0,0 @@
-# US Cable EIA-542 center frequencies
-# Incrementally Related Carriers (IRC)
-# Channels 1-125 are in ascending EIA/NCTA channel designation order
-
-#1
-A 75012500 QAM256
-A 57025000 QAM256
-A 63012500 QAM256
-A 69012500 QAM256
-A 79012500 QAM256
-A 85012500 QAM256
-A 177012500 QAM256
-A 183012500 QAM256
-A 189012500 QAM256
-#10
-A 195012500 QAM256
-A 201012500 QAM256
-A 207012500 QAM256
-A 213012500 QAM256
-A 123012500 QAM256
-A 129012500 QAM256
-A 135012500 QAM256
-A 141012500 QAM256
-A 147012500 QAM256
-A 153012500 QAM256
-#20
-A 159012500 QAM256
-A 165012500 QAM256
-A 171012500 QAM256
-A 219012500 QAM256
-A 225012500 QAM256
-A 231012500 QAM256
-A 237012500 QAM256
-A 243012500 QAM256
-A 249012500 QAM256
-A 255012500 QAM256
-#30
-A 261012500 QAM256
-A 267012500 QAM256
-A 273012500 QAM256
-A 279012500 QAM256
-A 285012500 QAM256
-A 291012500 QAM256
-A 297012500 QAM256
-A 303012500 QAM256
-A 309012500 QAM256
-A 315012500 QAM256
-#40
-A 321012500 QAM256
-A 327012500 QAM256
-A 333025000 QAM256
-A 339012500 QAM256
-A 345012500 QAM256
-A 351012500 QAM256
-A 357012500 QAM256
-A 363012500 QAM256
-A 369012500 QAM256
-A 375012500 QAM256
-#50
-A 381012500 QAM256
-A 387012500 QAM256
-A 393012500 QAM256
-A 399012500 QAM256
-A 405012500 QAM256
-A 411012500 QAM256
-A 417012500 QAM256
-A 423012500 QAM256
-A 429012500 QAM256
-A 435012500 QAM256
-#60
-A 441012500 QAM256
-A 447012500 QAM256
-A 453012500 QAM256
-A 459012500 QAM256
-A 465012500 QAM256
-A 471012500 QAM256
-A 477012500 QAM256
-A 483012500 QAM256
-A 489012500 QAM256
-A 495012500 QAM256
-#70
-A 501012500 QAM256
-A 507012500 QAM256
-A 513012500 QAM256
-A 519012500 QAM256
-A 525012500 QAM256
-A 531012500 QAM256
-A 537012500 QAM256
-A 543012500 QAM256
-A 549012500 QAM256
-A 555012500 QAM256
-#80
-A 561012500 QAM256
-A 567012500 QAM256
-A 573012500 QAM256
-A 579012500 QAM256
-A 585012500 QAM256
-A 591012500 QAM256
-A 597012500 QAM256
-A 603012500 QAM256
-A 609012500 QAM256
-A 615012500 QAM256
-#90
-A 621012500 QAM256
-A 627012500 QAM256
-A 633012500 QAM256
-A 639012500 QAM256
-A 645012500 QAM256
-A 93012500 QAM256
-A 99012500 QAM256
-A 105012500 QAM256
-A 111012500 QAM256
-A 117012500 QAM256
-#100
-A 651012500 QAM256
-A 657012500 QAM256
-A 663012500 QAM256
-A 669012500 QAM256
-A 675012500 QAM256
-A 681012500 QAM256
-A 687012500 QAM256
-A 693012500 QAM256
-A 699012500 QAM256
-A 705012500 QAM256
-#110
-A 711012500 QAM256
-A 717012500 QAM256
-A 723012500 QAM256
-A 729012500 QAM256
-A 735012500 QAM256
-A 741012500 QAM256
-A 747012500 QAM256
-A 753012500 QAM256
-A 759012500 QAM256
-A 765012500 QAM256
-#120
-A 771012500 QAM256
-A 777012500 QAM256
-A 783012500 QAM256
-A 789012500 QAM256
-A 795012500 QAM256
-A 801012500 QAM256
diff --git a/atsc/us-Cable-HRC-center-frequencies-QAM256 b/atsc/us-Cable-HRC-center-frequencies-QAM256
deleted file mode 100644
index 2bc38383..00000000
--- a/atsc/us-Cable-HRC-center-frequencies-QAM256
+++ /dev/null
@@ -1,142 +0,0 @@
-# US Cable center frequencies
-# Harmonically Related Carriers (HRC)
-# Channels are in ascending EIA/NCTA channel designation order
-
-#1
-A 73753600 QAM256
-A 55752700 QAM256
-A 61753000 QAM256
-A 67753300 QAM256
-A 77753900 QAM256
-A 83754200 QAM256
-A 175758700 QAM256
-A 181759000 QAM256
-A 187759300 QAM256
-#10
-A 193759600 QAM256
-A 199759900 QAM256
-A 205760200 QAM256
-A 211760500 QAM256
-A 121756000 QAM256
-A 127756300 QAM256
-A 133756600 QAM256
-A 139756900 QAM256
-A 145757200 QAM256
-A 151757500 QAM256
-#20
-A 157757800 QAM256
-A 163758100 QAM256
-A 169758400 QAM256
-A 217760800 QAM256
-A 223761100 QAM256
-A 229761400 QAM256
-A 235761700 QAM256
-A 241762000 QAM256
-A 247762300 QAM256
-A 253762600 QAM256
-#30
-A 259762900 QAM256
-A 265763200 QAM256
-A 271763500 QAM256
-A 277763800 QAM256
-A 283764100 QAM256
-A 289764400 QAM256
-A 295764700 QAM256
-A 301765000 QAM256
-A 307765300 QAM256
-A 313765600 QAM256
-#40
-A 319765900 QAM256
-A 325766200 QAM256
-A 331766500 QAM256
-A 337766800 QAM256
-A 343767100 QAM256
-A 349767400 QAM256
-A 355767700 QAM256
-A 361768000 QAM256
-A 367768300 QAM256
-A 373768600 QAM256
-#50
-A 379768900 QAM256
-A 385769200 QAM256
-A 391769500 QAM256
-A 397769800 QAM256
-A 403770100 QAM256
-A 409770400 QAM256
-A 415770700 QAM256
-A 421771000 QAM256
-A 427771300 QAM256
-A 433771600 QAM256
-#60
-A 439771900 QAM256
-A 445772200 QAM256
-A 451772500 QAM256
-A 457772800 QAM256
-A 463773100 QAM256
-A 469773400 QAM256
-A 475773700 QAM256
-A 481774000 QAM256
-A 487774300 QAM256
-A 493774600 QAM256
-#70
-A 499774900 QAM256
-A 505775200 QAM256
-A 511775500 QAM256
-A 517775800 QAM256
-A 523776100 QAM256
-A 529776400 QAM256
-A 535776700 QAM256
-A 541777000 QAM256
-A 547777300 QAM256
-A 553777600 QAM256
-#80
-A 559777900 QAM256
-A 565778200 QAM256
-A 571778500 QAM256
-A 577778800 QAM256
-A 583779100 QAM256
-A 589779400 QAM256
-A 595779700 QAM256
-A 601780000 QAM256
-A 607780300 QAM256
-A 613780600 QAM256
-#90
-A 619780900 QAM256
-A 625781200 QAM256
-A 631781500 QAM256
-A 637781800 QAM256
-A 643782100 QAM256
-A 91754500 QAM256
-A 97754800 QAM256
-A 103755100 QAM256
-A 109755400 QAM256
-A 115755700 QAM256
-#100
-A 649782400 QAM256
-A 655782700 QAM256
-A 661783000 QAM256
-A 667783300 QAM256
-A 673783600 QAM256
-A 679783900 QAM256
-A 685784200 QAM256
-A 691784500 QAM256
-A 697784800 QAM256
-A 703785100 QAM256
-#110
-A 709785400 QAM256
-A 715785700 QAM256
-A 721786000 QAM256
-A 727786300 QAM256
-A 733786600 QAM256
-A 739786900 QAM256
-A 745787200 QAM256
-A 751787500 QAM256
-A 757787800 QAM256
-A 763788100 QAM256
-#120
-A 769788400 QAM256
-A 775788700 QAM256
-A 781789000 QAM256
-A 787789300 QAM256
-A 793789600 QAM256
-A 799789900 QAM256
diff --git a/atsc/us-Cable-IRC-center-frequencies-QAM256 b/atsc/us-Cable-IRC-center-frequencies-QAM256
deleted file mode 100644
index 72842e0c..00000000
--- a/atsc/us-Cable-IRC-center-frequencies-QAM256
+++ /dev/null
@@ -1,142 +0,0 @@
-# US Cable center frequencies
-# Incrementally Related Carriers (IRC)
-# Channels are in ascending EIA/NCTA channel designation order
-
-#1
-A 75000000 QAM256
-A 57000000 QAM256
-A 63000000 QAM256
-A 69000000 QAM256
-A 79000000 QAM256
-A 85000000 QAM256
-A 177000000 QAM256
-A 183000000 QAM256
-A 189000000 QAM256
-#10
-A 195000000 QAM256
-A 201000000 QAM256
-A 207000000 QAM256
-A 213000000 QAM256
-A 123000000 QAM256
-A 129000000 QAM256
-A 135000000 QAM256
-A 141000000 QAM256
-A 147000000 QAM256
-A 153000000 QAM256
-#20
-A 159000000 QAM256
-A 165000000 QAM256
-A 171000000 QAM256
-A 219000000 QAM256
-A 225000000 QAM256
-A 231000000 QAM256
-A 237000000 QAM256
-A 243000000 QAM256
-A 249000000 QAM256
-A 255000000 QAM256
-#30
-A 261000000 QAM256
-A 267000000 QAM256
-A 273000000 QAM256
-A 279000000 QAM256
-A 285000000 QAM256
-A 291000000 QAM256
-A 297000000 QAM256
-A 303000000 QAM256
-A 309000000 QAM256
-A 315000000 QAM256
-#40
-A 321000000 QAM256
-A 327000000 QAM256
-A 333000000 QAM256
-A 339000000 QAM256
-A 345000000 QAM256
-A 351000000 QAM256
-A 357000000 QAM256
-A 363000000 QAM256
-A 369000000 QAM256
-A 375000000 QAM256
-#50
-A 381000000 QAM256
-A 387000000 QAM256
-A 393000000 QAM256
-A 399000000 QAM256
-A 405000000 QAM256
-A 411000000 QAM256
-A 417000000 QAM256
-A 423000000 QAM256
-A 429000000 QAM256
-A 435000000 QAM256
-#60
-A 441000000 QAM256
-A 447000000 QAM256
-A 453000000 QAM256
-A 459000000 QAM256
-A 465000000 QAM256
-A 471000000 QAM256
-A 477000000 QAM256
-A 483000000 QAM256
-A 489000000 QAM256
-A 495000000 QAM256
-#70
-A 501000000 QAM256
-A 507000000 QAM256
-A 513000000 QAM256
-A 519000000 QAM256
-A 525000000 QAM256
-A 531000000 QAM256
-A 537000000 QAM256
-A 543000000 QAM256
-A 549000000 QAM256
-A 555000000 QAM256
-#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
-#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A 93000000 QAM256
-A 99000000 QAM256
-A 105000000 QAM256
-A 111000000 QAM256
-A 117000000 QAM256
-#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
-#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
-#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
diff --git a/atsc/us-Cable-Standard-center-frequencies-QAM256 b/atsc/us-Cable-Standard-center-frequencies-QAM256
deleted file mode 100644
index c20fe9cb..00000000
--- a/atsc/us-Cable-Standard-center-frequencies-QAM256
+++ /dev/null
@@ -1,176 +0,0 @@
-# US EIA/NCTA Standard Cable center frequencies
-# Channels are in ascending EIA/NCTA channel designation order
-
-#2
-A 57000000 QAM256
-A 63000000 QAM256
-A 69000000 QAM256
-A 79000000 QAM256
-A 85000000 QAM256
-A 177000000 QAM256
-A 183000000 QAM256
-A 189000000 QAM256
-#10
-A 195000000 QAM256
-A 201000000 QAM256
-A 207000000 QAM256
-A 213000000 QAM256
-A 123012500 QAM256
-A 129012500 QAM256
-A 135012500 QAM256
-A 141000000 QAM256
-A 147000000 QAM256
-A 153000000 QAM256
-#20
-A 159000000 QAM256
-A 165000000 QAM256
-A 171000000 QAM256
-A 219000000 QAM256
-A 225000000 QAM256
-A 231012500 QAM256
-A 237012500 QAM256
-A 243012500 QAM256
-A 249012500 QAM256
-A 255012500 QAM256
-#30
-A 261012500 QAM256
-A 267012500 QAM256
-A 273012500 QAM256
-A 279012500 QAM256
-A 285012500 QAM256
-A 291012500 QAM256
-A 297012500 QAM256
-A 303012500 QAM256
-A 309012500 QAM256
-A 315012500 QAM256
-#40
-A 321012500 QAM256
-A 327012500 QAM256
-A 333025000 QAM256
-A 339012500 QAM256
-A 345012500 QAM256
-A 351012500 QAM256
-A 357012500 QAM256
-A 363012500 QAM256
-A 369012500 QAM256
-A 375012500 QAM256
-#50
-A 381012500 QAM256
-A 387012500 QAM256
-A 393012500 QAM256
-A 399012500 QAM256
-A 405000000 QAM256
-A 411000000 QAM256
-A 417000000 QAM256
-A 423000000 QAM256
-A 429000000 QAM256
-A 435000000 QAM256
-#60
-A 441000000 QAM256
-A 447000000 QAM256
-A 453000000 QAM256
-A 459000000 QAM256
-A 465000000 QAM256
-A 471000000 QAM256
-A 477000000 QAM256
-A 483000000 QAM256
-A 489000000 QAM256
-A 495000000 QAM256
-#70
-A 501000000 QAM256
-A 507000000 QAM256
-A 513000000 QAM256
-A 519000000 QAM256
-A 525000000 QAM256
-A 531000000 QAM256
-A 537000000 QAM256
-A 543000000 QAM256
-A 549000000 QAM256
-A 555000000 QAM256
-#80
-A 561000000 QAM256
-A 567000000 QAM256
-A 573000000 QAM256
-A 579000000 QAM256
-A 585000000 QAM256
-A 591000000 QAM256
-A 597000000 QAM256
-A 603000000 QAM256
-A 609000000 QAM256
-A 615000000 QAM256
-#90
-A 621000000 QAM256
-A 627000000 QAM256
-A 633000000 QAM256
-A 639000000 QAM256
-A 645000000 QAM256
-A 93000000 QAM256
-A 99000000 QAM256
-A 105000000 QAM256
-A 111025000 QAM256
-A 117025000 QAM256
-#100
-A 651000000 QAM256
-A 657000000 QAM256
-A 663000000 QAM256
-A 669000000 QAM256
-A 675000000 QAM256
-A 681000000 QAM256
-A 687000000 QAM256
-A 693000000 QAM256
-A 699000000 QAM256
-A 705000000 QAM256
-#110
-A 711000000 QAM256
-A 717000000 QAM256
-A 723000000 QAM256
-A 729000000 QAM256
-A 735000000 QAM256
-A 741000000 QAM256
-A 747000000 QAM256
-A 753000000 QAM256
-A 759000000 QAM256
-A 765000000 QAM256
-#120
-A 771000000 QAM256
-A 777000000 QAM256
-A 783000000 QAM256
-A 789000000 QAM256
-A 795000000 QAM256
-A 801000000 QAM256
-A 807000000 QAM256
-A 813000000 QAM256
-A 819000000 QAM256
-A 825000000 QAM256
-#121
-A 831000000 QAM256
-A 837000000 QAM256
-A 843000000 QAM256
-A 849000000 QAM256
-A 855000000 QAM256
-A 861000000 QAM256
-A 867000000 QAM256
-A 873000000 QAM256
-A 879000000 QAM256
-A 885000000 QAM256
-#122
-A 891000000 QAM256
-A 897000000 QAM256
-A 903000000 QAM256
-A 909000000 QAM256
-A 915000000 QAM256
-A 921000000 QAM256
-A 927000000 QAM256
-A 933000000 QAM256
-A 939000000 QAM256
-A 945000000 QAM256
-#123
-A 951000000 QAM256
-A 957000000 QAM256
-A 963000000 QAM256
-A 969000000 QAM256
-A 975000000 QAM256
-A 981000000 QAM256
-A 987000000 QAM256
-A 993000000 QAM256
-A 999000000 QAM256
diff --git a/atsc/us-ID-Boise b/atsc/us-ID-Boise
deleted file mode 100644
index 9fe7cd27..00000000
--- a/atsc/us-ID-Boise
+++ /dev/null
@@ -1,8 +0,0 @@
-# Boise, ID, USA
-# A freq mod
-A 195000000 8VSB
-A 213000000 8VSB
-A 515000000 8VSB
-A 533000000 8VSB
-A 545000000 8VSB
-A 557000000 8VSB
diff --git a/atsc/us-MA-Boston b/atsc/us-MA-Boston
deleted file mode 100644
index 05f170ae..00000000
--- a/atsc/us-MA-Boston
+++ /dev/null
@@ -1,13 +0,0 @@
-# initial tuning data for Boston, MA
-
-A 503000000 8VSB
-A 509000000 8VSB
-A 527000000 8VSB
-A 563000000 8VSB
-A 569000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 623000000 8VSB
-A 635000000 8VSB
-A 641000000 8VSB
-A 647000000 8VSB
diff --git a/atsc/us-MI-Lansing b/atsc/us-MI-Lansing
deleted file mode 100644
index 167555fc..00000000
--- a/atsc/us-MI-Lansing
+++ /dev/null
@@ -1,7 +0,0 @@
-# initial tuning data for Lansing, MI
-
-A 617000000 8VSB
-A 695000000 8VSB
-A 719000000 8VSB
-A 731000000 8VSB
-A 743000000 8VSB
diff --git a/atsc/us-NTSC-center-frequencies-8VSB b/atsc/us-NTSC-center-frequencies-8VSB
deleted file mode 100644
index 6eb586ce..00000000
--- a/atsc/us-NTSC-center-frequencies-8VSB
+++ /dev/null
@@ -1,70 +0,0 @@
-# US NTSC center frequencies, use if in doubt
-
-A 57000000 8VSB
-A 63000000 8VSB
-A 69000000 8VSB
-A 79000000 8VSB
-A 85000000 8VSB
-A 177000000 8VSB
-A 183000000 8VSB
-A 189000000 8VSB
-A 195000000 8VSB
-A 201000000 8VSB
-A 207000000 8VSB
-A 213000000 8VSB
-A 473000000 8VSB
-A 479000000 8VSB
-A 485000000 8VSB
-A 491000000 8VSB
-A 497000000 8VSB
-A 503000000 8VSB
-A 509000000 8VSB
-A 515000000 8VSB
-A 521000000 8VSB
-A 527000000 8VSB
-A 533000000 8VSB
-A 539000000 8VSB
-A 545000000 8VSB
-A 551000000 8VSB
-A 557000000 8VSB
-A 563000000 8VSB
-A 569000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 587000000 8VSB
-A 593000000 8VSB
-A 599000000 8VSB
-A 605000000 8VSB
-A 611000000 8VSB
-A 617000000 8VSB
-A 623000000 8VSB
-A 629000000 8VSB
-A 635000000 8VSB
-A 641000000 8VSB
-A 647000000 8VSB
-A 653000000 8VSB
-A 659000000 8VSB
-A 665000000 8VSB
-A 671000000 8VSB
-A 677000000 8VSB
-A 683000000 8VSB
-A 689000000 8VSB
-A 695000000 8VSB
-A 701000000 8VSB
-A 707000000 8VSB
-A 713000000 8VSB
-A 719000000 8VSB
-A 725000000 8VSB
-A 731000000 8VSB
-A 737000000 8VSB
-A 743000000 8VSB
-A 749000000 8VSB
-A 755000000 8VSB
-A 761000000 8VSB
-A 767000000 8VSB
-A 773000000 8VSB
-A 779000000 8VSB
-A 785000000 8VSB
-A 791000000 8VSB
-A 797000000 8VSB
-A 803000000 8VSB
diff --git a/atsc/us-PA-Philadelphia b/atsc/us-PA-Philadelphia
deleted file mode 100644
index eea9685a..00000000
--- a/atsc/us-PA-Philadelphia
+++ /dev/null
@@ -1,16 +0,0 @@
-# US NY state
-
-#A 183000000 8VSB
-#A 515000000 8VSB
-#A 545000000 8VSB
-#A 551000000 8VSB
-A 575000000 8VSB
-A 581000000 8VSB
-A 593000000 8VSB
-#A 641000000 8VSB
-A 647000000 8VSB
-A 713000000 8VSB
-#A 719000000 8VSB
-A 773000000 8VSB
-A 785000000 8VSB
-A 791000000 8VSB
diff --git a/channels-conf/atsc/us-Raleigh-Durham b/channels-conf/atsc/us-Raleigh-Durham
deleted file mode 100644
index 48d14d26..00000000
--- a/channels-conf/atsc/us-Raleigh-Durham
+++ /dev/null
@@ -1,8 +0,0 @@
-# Most of the major channels in the Raleigh Durham Area. Frequencies the NTSC center freq.
-WRAL:707000000:8VSB:33:36
-WNCN:719000000:8VSB:49:52
-WTVD:701000000:8VSB:49:52
-WRAZ:683000000:8VSB:49:52
-WUNC:743000000:8VSB:49:52
-WRDU:551000000:8VSB:33:36
-WLFL:731000000:8VSB:33:36
diff --git a/channels-conf/dvb-s/Astra-19.2E b/channels-conf/dvb-s/Astra-19.2E
deleted file mode 100644
index 6e634b99..00000000
--- a/channels-conf/dvb-s/Astra-19.2E
+++ /dev/null
@@ -1,226 +0,0 @@
-Das Erste:11837:h:0:27500:101:102:28106
-ZDF:11954:h:0:27500:110:120:28006
-3sat:11954:h:0:27500:210:220:28007
-EinsMuXx:12110:h:0:27500:301:302:28203
-EinsFestival:12110:h:0:27500:201:202:28202
-EinsExtra:12110:h:0:27500:101:102:28201
-MDR FERNSEHEN:12110:h:0:27500:401:402:28204
-ORB-Fernsehen:12110:h:0:27500:501:502:28205
-B1 Berlin:12110:h:0:27500:601:602:28206
-SWR Fernsehen:11837:h:0:27500:801:802:28113
-SR Fernsehen Suedwes:11837:h:0:27500:501:502:28110
-hessen fernsehen:11837:h:0:27500:301:302:28108
-WDR FERNSEHEN:11837:h:0:27500:601:602:28111
-Bayerisches FS:11837:h:0:27500:201:202:28107
-N3:12110:h:0:27500:2401:2402:28224
-BR-alpha:11837:h:0:27500:701:702:28112
-KiKa:11954:h:0:27500:310:320:28008
-arte:11836:h:0:27500:401:402:28109
-ZDF Theaterkanal:11954:h:0:27500:1110:1120:28016
-ZDF.info:11954:h:0:27500:610:620:28011
-ZDF.doku:11954:h:0:27500:660:670:28014
-Phoenix:11837:h:0:27500:901:902:28114
-DW-tv:10786:v:0:21997:305:306:9005
-RTL Television:12188:h:0:27500:163:104:12003
-SAT.1:12480:v:0:27500:1791:1792:46
-ProSieben:12480:v:0:27500:255:256:898
-RTL2:12188:h:0:27500:166:128:12020
-Super RTL:12188:h:0:27500:165:120:12040
-KABEL1:12480:v:0:27500:511:512:899
-VOX:12188:h:0:27500:167:136:12060
-tm3:12480:v:0:27500:767:768:897
-Bloomberg TV Germany:12552:v:0:22000:162:99:12160
-EuroNews:11954:h:0:27500:2221:2233:28015
-N24:12480:v:0:27500:2047:2048:47
-n-tv:12670:v:0:22000:162:96:12730
-DSF:12480:v:0:27500:1023:1024:900
-Eurosport:11954:h:0:27500:410:420:28009
-Via 1 - Sch ner Re:12148:h:0:27500:511:512:44
-Home Order Tel:12480:v:0:27500:1279:1280:40
-QVC GERMANY:12552:v:0:22000:165:166:12100
-TW 1:12692:h:0:22000:166:167:13013
-Canal Canarias:12441:v:0:27500:513:681:29700
-ProSieben A:12051:v:0:27500:161:84:20002
-ProSieben CH:12051:v:0:27500:289:290:20001
-Kabel 1 Austria:12051:v:0:27500:166:167:20004
-Kabel 1 Schweiz:12051:v:0:27500:162:163:20003
-CNN Int.:12168:v:0:27500:165:100:28512
-Sky News:12552:v:0:22000:305:306:3995
-Travel:12168:v:0:27500:163:92:28001
-AB SAT / XXL:12266:h:0:27500:164:96:17004
-MOTEURS:12266:h:0:27500:160:80:17000
-HOT GM:12148:h:0:27500:767:768:45
-KTO:12129:v:0:27500:170:120:8411
-LA CINQUIEME:12207:v:0:27500:160:80:8501
-LCP:12207:v:0:27500:165:100:8506
-LibertyTV.com:12611:v:0:22000:941:942:12280
-TV5 Europe:12611:v:0:22000:45:46:12240
-Motors TV:12611:v:0:22000:191:194:12300
-Wishline:12611:v:0:22000:214:216:12320
-TV 5:10786:v:0:21997:164:112:9001
-RTM - MAROC:10786:v:0:21997:162:96:9002
-ESC1 - EGYPTE:10786:v:0:21997:163:104:9003
-RAI 1:10786:v:0:21997:289:290:9004
-RTPI:10786:v:0:21997:300:301:9006
-TV7:10786:v:0:21997:166:128:9007
-ARTE:10786:v:0:21997:167:136:9009
-Colourbars:12611:v:0:22000:48:49:3982
-Alice:12611:v:0:22000:162:96:12200
-Video Italia:12611:v:0:22000:121:122:12220
-ANDALUCIA TV:11934:v:0:27500:166:104:29011
-TVC INT.:12441:v:0:27500:512:660:29701
-TV4:11992:h:0:27500:165:98:20365
-TV Niepokalanow:11876:h:0:27500:161:82:20601
-VIVA:12670:v:0:22000:309:310:12732
-VIVA ZWEI:12552:v:0:22000:171:172:12120
-MTV Central:12699:v:0:22000:3031:3032:28643
-ONYX:12692:h:1:27500:161:84:502
-VIVA polska:11603:h:1:27500:190:191:611
-DeeJay TV:11603:h:1:27500:160:161:602
-NBC:11053:h:1:27500:550:551:8008
-EWTN:10722:h:1:29900:1001:1201:4601
-MTA INTL:10722:h:1:29900:1004:1204:4604
-VOX:11053:h:1:27500:500:501:8002
-SAT.1 A:11053:h:1:27500:511:512:8003
-RTL2 AUSTRIA:11053:h:1:27500:520:521:8004
-ZDF:11053:h:1:27500:570:571:8011
-K-TV:11053:h:1:27500:580:581:8012
-RTL Television:11053:h:1:27500:160:80:8001
-ARTE:11059:v:1:6510:98:99:1
-HOT Italia:11095:h:1:27500:4194:4195:3714
-Olisat:11095:h:1:27500:33:34:3718
-VIVA-POLSKA:11128:h:1:4340:98:99:1
-DW-tv:11195:v:1:9099:101:102:5301
-Canal 24 Horas:11203:h:1:3999:4130:4131:5301
-TV5:11337:v:1:5631:512:640:1
-SAT.1 CH:11603:h:1:27500:101:102:601
-KurdSat:11603:h:1:27500:111:112:603
-ARD "Das Erste":11603:h:1:27500:172:173:606
-RTL 2 CH:11603:h:1:27500:175:176:609
-Super RTL A:11603:h:1:27500:180:181:610
-TV ROMANIA:11622:v:1:27500:227:247:10707
-MRTV:11622:v:1:27500:222:242:10702
-102.5 HIT Ch:11622:v:1:27500:224:244:10704
-TLC SAT:11622:v:1:27500:225:245:10705
-PRO-SAT:11622:v:1:27500:246:226:10706
-Channel SUN:11622:v:1:27500:229:249:10709
-Racing Channel:11622:v:1:27500:228:248:10708
-3 ABN:11622:v:1:27500:221:241:10701
-Bloom.Germany:11642:h:1:27500:1460:1420:4
-Bloomberg TV UK:11642:h:1:27500:1560:1520:4
-Sat 7:11642:h:1:27500:1660:1620:4
-EDTV 1:11746:h:1:27500:4130:4131:9501
-EDTV SPORT:11746:h:1:27500:4386:4387:9502
-EDTV BUSINESS:11746:h:1:27500:4642:4643:9503
-EDTV DRAMA:11746:h:1:27500:4898:4899:9504
-RAI1:11765:v:1:27499:160:80:3401
-RAI2:11765:v:1:27499:161:84:3402
-RAI3:11765:v:1:27499:162:88:3403
-RaiWayTEST2:11765:v:1:27499:516:654:3405
-RAIMOSAICO:11765:v:1:27499:518:8191:3407
-RAINews24:11803:v:1:27500:516:654:3301
-CAMERA DEPUTATI:11803:v:1:27500:517:655:3302
-TELEPACE:11803:v:1:27500:515:653:3304
-RAISPORTSAT:11803:v:1:27500:512:650:3305
-RAINettunoSAT2:11803:v:1:27500:513:651:3306
-RAIeducational:11803:v:1:27500:514:652:3307
-RAINettunoSAT1:11803:v:1:27500:519:657:3308
-SAT2000:11803:v:1:27500:518:656:3309
-I1:11918:v:1:27499:512:650:1
-C5:11918:v:1:27499:513:660:2
-R4:11918:v:1:27499:514:670:3
-Telesierra:12091:h:1:27500:4160:4161:8704
-C. Milagro:12091:h:1:27500:4368:4369:8711
-Italia Sat:12091:h:1:27500:4600:4601:8728
-TVE Internacional:12091:h:1:27500:4208:4209:8707
-Fiesta:12091:h:1:27500:4432:4433:8720
-Retelsat:12091:h:1:27500:4464:4465:8722
-ART EUROPE:12013:h:1:27495:164:96:450
-EGYPT SAT. CH. 2:12013:h:1:27495:166:104:470
-IQRA:12013:h:1:27495:168:112:474
-MAURITANIA TV:12110:v:1:27500:230:231:704
-ARMENIA TV:12110:v:1:27500:240:241:705
-SAILING CHANNEL:12110:v:1:27500:260:261:707
-AL JAZEERA:12110:v:1:27500:270:271:708
-Coming Soon TV:12110:v:1:27500:310:311:717
-SaluteBenessere:12110:v:1:27500:320:321:718
-AH-EDP1:12148:v:1:27499:96:97:7201
-AH-EDP2:12148:v:1:27499:112:113:7202
-Espresso:12148:v:1:27499:192:193:7203
-Alice:12148:v:1:27499:160:161:7220
-Nuvolari:12148:v:1:27499:176:177:7221
-Leonardo:12148:v:1:27499:128:129:7222
-AH-EDP3:12148:v:1:27499:36:37:7205
-OTE Promo:12187:v:1:27500:517:655:1001
-RTS SAT:12187:v:1:27500:519:657:1022
-ERT SAT:12187:v:1:27500:514:652:1102
-EXTRA:12187:v:1:27500:516:654:1106
-TRIAL:12187:v:1:27500:513:651:1108
-Minimax:11303:h:1:19540:300:301:3
-TVN1:12209:h:1:5631:4194:4195:1
-RR TEST:10978:v:1:8998:33:34:1
-TV 5 Thailand:10978:v:1:8998:1057:1058:2
-TEST-1:10978:v:1:8998:3105:3106:4
-FASHION:12244:h:1:27500:123:133:103
-AJARA TV:12244:h:1:27500:127:137:107
-SLO-TV1:12300:v:1:27495:200:201:3201
-POLONIA 1:12302:v:1:27500:205:206:3203
-SUPER 1:12302:v:1:27500:207:208:3207
-NAPOLI INT.:12302:v:1:27500:240:241:3210
-MAGIC:12302:v:1:27500:245:246:3211
-COUNTDOWN:12302:v:1:27500:235:236:3212
-TBNE:12302:v:1:27500:230:231:3213
-NAPOLI CHANNEL:12302:v:1:27500:227:228:3215
-KURDISTAN TV:12302:v:1:27500:225:226:3214
-ATLAS TV:12379:v:1:27500:3022:3032:3002
-TELE 24 SWITZERLAND:12379:v:1:27500:3023:3033:3003
-Abu Dhabi TV:12379:v:1:27500:3024:3034:3004
-RTV MONTENEGRO:12379:v:1:27500:3026:3036:3006
-JAAM-E-JAM 1:12436:h:1:27500:160:80:1
-JAAM-E-JAM 2:12436:h:1:27500:161:82:2
-SAHAR:12436:h:1:27500:162:84:3
-SAHAR 2:12436:h:1:27500:163:86:4
-IRINN:12436:h:1:27500:164:88:5
-Musicmax:11303:h:1:19540:500:501:6
-TEST:12474:h:1:27500:771:8191:10608
-EbS:12474:h:1:27500:101:201:10601
-MOU.2:12474:h:1:27500:42:43:10602
-PINK PLUS:12474:h:1:27500:308:256:10605
-LibertyTV.com:12474:h:1:27500:941:942:10603
-2M Maroc:12474:h:1:27500:601:602:10607
-ZEE TV:12474:h:1:27500:910:911:10604
-WorldNet Europe:12483:v:1:8299:4260:4220:1
-WorldNet:12483:v:1:8299:4560:4520:4
-SICILIA INTERNATIONA:12519:v:1:27499:501:502:8309
-SARDEGNA UNO:12519:v:1:27499:503:504:8310
-EuroMed:12519:v:1:27499:510:511:8312
-TGRT:12519:v:1:27499:505:506:8313
-VIDEOLINA:12519:v:1:27499:515:516:8318
-MEDIOLANUM:12538:h:1:27500:1131:1132:8987
-www.travel:12538:h:1:27500:1180:1183:8992
-MonteCarloSat:12538:h:1:27500:5126:5122:8877
-Bulgaria TV:12538:h:1:27500:4612:4613:8827
-TVN1:12571:h:1:5631:4194:4195:1
-JSTV 1:12595:v:1:27500:2000:2001:8213
-JSTV 2:12595:v:1:27500:2011:2013:8214
-MBC:12595:v:1:27500:160:80:8201
-ANN:12595:v:1:27500:161:84:8202
-BET:12595:v:1:27500:167:108:8208
-EuroNews:12595:v:1:27500:2221:2231:8211
-Sharjah Arabs:12653:h:1:27500:1160:1120:1
-Qatar Arabs:12653:h:1:27500:1260:1220:2
-Saudi 1 Arabs:12653:h:1:27500:1360:1320:3
-Kuwait Arabs:12653:h:1:27500:1460:1420:4
-Libya Arabs:12653:h:1:27500:1560:1520:5
-Sudan Arabs:12653:h:1:27500:1660:1620:6
-Oman Arabs:12653:h:1:27500:1760:1720:7
-Jordan Arabs:12653:h:1:27500:1860:1820:8
-IRAQ TV:12653:h:1:27500:1960:1920:9
-Dubai Sport:12653:h:1:27500:1060:1020:10
-Digitaly:12672:v:1:27500:220:221:4203
-Telemarket:12672:v:1:27500:350:351:4211
-eVision:12672:v:1:27500:360:361:4214
-Thai TV5:12672:v:1:27500:200:201:4201
-Studio Europa:12672:v:1:27500:230:231:4204
-Video Italia:12672:v:1:27500:340:341:4210
-GAME NETWORK:12672:v:1:27500:291:292:4213
diff --git a/channels-conf/dvb-s/Astra-28.2E b/channels-conf/dvb-s/Astra-28.2E
deleted file mode 100644
index cbba30a2..00000000
--- a/channels-conf/dvb-s/Astra-28.2E
+++ /dev/null
@@ -1,522 +0,0 @@
-BBC 1 London:10773:h:0:22000:2304:2306:6301
-BBC 2 England:10773:h:0:22000:2320:2322:6302
-BBC NEWS 24:10773:h:0:22000:2329:2331:6304
-ETV:10773:h:0:22000:2333:2335:6306
-BBC TES 3:10773:h:0:22000:2325:2327:6315
-CBBC Channel:10773:h:0:22000:2325:2327:6317
-CBeebies:10773:h:0:22000:2333:2335:6318
-BBC 1 NI:10773:h:0:22000:2316:2318:6331
-BBC R Cymru:10773:h:0:22000:0:2340:6363
-BBC TES Test:10773:h:0:22000:0:0:6308
-BBC TES 2:10773:h:0:22000:0:0:6309
-BBC FOUR:10773:h:0:22000:0:0:6316
-BBC THREE:10773:h:0:22000:0:0:6319
-[1341]:11469:h:0:27500:521:649:4929
-[1342]:11469:h:0:27500:522:650:4930
-MMS 5:11469:h:0:27500:0:0:5044
-MMS 6:11469:h:0:27500:0:0:5045
-Sky Active:11469:h:0:27500:0:0:5107
-[140a]:11469:h:0:27500:518:646:5130
-[146b]:11469:h:0:27500:512:640:5227
-[146c]:11469:h:0:27500:513:641:5228
-[1016]:11469:h:0:27500:514:642:4118
-[10e9]:11469:h:0:27500:519:647:4329
-[1279]:11469:h:0:27500:520:648:4729
-Sky Customer Service:11469:h:0:27500:0:0:5240
-Directgov - Govt Info:11469:h:0:27500:0:0:5241
-[1596]:11469:h:0:27500:515:643:5526
-[1597]:11469:h:0:27500:516:644:5527
-[159a]:11469:h:0:27500:517:645:5530
-[15a4]:11469:h:0:27500:0:0:5540
-[05dc]:11469:h:0:27500:0:0:1500
-[1017]:11469:h:0:27500:0:0:4119
-Sky Box Office:11469:h:0:27500:0:0:4121
-Sky Box Office:11469:h:0:27500:0:0:4122
-Sky Box Office:11469:h:0:27500:0:0:4123
-Sky Box Office:11469:h:0:27500:0:0:4124
-Sky Box Office:11469:h:0:27500:0:0:4129
-POP:12285:v:0:27500:2311:2312:52500
-3751 PH:12285:v:0:27500:2311:2312:52501
-Chart Show TV:12285:v:0:27500:2309:2310:52505
-3761 PH:12285:v:0:27500:2313:2314:52512
-The Vault:12285:v:0:27500:2322:2323:52515
-Chase-it.tv:12285:v:0:27500:2318:2319:52520
-OBE:12285:v:0:27500:2307:2308:52525
-Tiny Pop:12285:v:0:27500:2316:2317:52530
-Spice Extreme:12285:v:0:27500:2320:2321:52561
-Climax3 - 1:12285:v:0:27500:2324:2325:52562
-Climax3 - 2:12285:v:0:27500:2326:2327:52563
-Climax3 - 3:12285:v:0:27500:2328:2329:52564
-Adult Channel:12285:v:0:27500:2330:2331:52565
-Playboy TV:12285:v:0:27500:2313:2314:52566
-52567:12285:v:0:27500:2330:2331:52567
-3911 PH:12285:v:0:27500:2320:2321:52581
-IDMT:12148:h:0:27500:2307:2308:52200
- Broadband UK:12148:h:0:27500:2305:2306:52210
-52220:12148:h:0:27500:2309:2310:52220
-Trouble Reload:12148:h:0:27500:2311:2312:52230
-Challenge+1:12148:h:0:27500:2314:2315:52232
-Ftn:12148:h:0:27500:0:0:52231
-[15ff]:10920:h:0:22000:516:644:5631
-D'covery H&L+:10920:h:0:22000:2305:2306:50003
-Eurosportnews:10920:h:0:22000:2307:2308:5009
-Hallmark:10920:h:0:22000:2310:2311:5010
-[13a2]:10920:h:0:22000:512:640:5026
-[13a4]:10920:h:0:22000:514:642:5028
-[13a5]:10920:h:0:22000:515:643:5029
-[05e6]:10920:h:0:22000:0:0:1510
-Sky Box Office:10920:h:0:22000:0:0:4122
-Sky Box Office:10920:h:0:22000:0:0:4123
-Sky Box Office:10920:h:0:22000:0:0:4124
-Sky Box Office:10920:h:0:22000:0:0:4129
-SportxxxBabes:10920:h:0:22000:0:0:4137
-[1393]:10920:h:0:22000:0:0:5011
-[15fb]:10920:h:0:22000:0:0:5627
-SAB TV:12226:h:0:27500:2310:2311:52401
-Performance:12226:h:0:27500:2312:2313:52402
-channel U:12226:h:0:27500:2314:2315:52403
-Gems.tv:12226:h:0:27500:2317:2318:52404
-Soundtrack ch.:12226:h:0:27500:2307:2308:52405
-HorrorChannel:12226:h:0:27500:2342:2343:52406
-Chat Box:12226:h:0:27500:2319:2320:52407
-Golf Channel:12226:h:0:27500:2321:2322:52408
-Ex&Mart TV:12226:h:0:27500:2323:2324:52409
-TVW Select:12226:h:0:27500:2305:2306:52412
-Game In TV:12226:h:0:27500:2335:2336:52414
-Majestic TV:12226:h:0:27500:2340:2341:52415
-18PlusXXX:12226:h:0:27500:0:0:52410
-XXXHousewive:12226:h:0:27500:0:0:52411
-52421:12226:h:0:27500:0:0:52421
-[10ea]:11603:v:0:27500:514:662:4330
-[114e]:11603:v:0:27500:515:663:4430
-[11b2]:11603:v:0:27500:516:664:4530
-[1215]:11603:v:0:27500:521:669:4629
-[1216]:11603:v:0:27500:517:665:4630
-[127a]:11603:v:0:27500:518:666:4730
-[12de]:11603:v:0:27500:519:667:4830
-[13a6]:11603:v:0:27500:512:660:5030
-[1409]:11603:v:0:27500:522:670:5129
-[146a]:11603:v:0:27500:520:668:5226
-[1599]:11603:v:0:27500:523:671:5529
-[15fa]:11603:v:0:27500:513:661:5626
-Sky Box Office:11603:v:0:27500:0:0:4124
-Sky Box Office:11603:v:0:27500:0:0:4129
-MMS 4:11603:v:0:27500:0:0:5043
-MMS 8:11603:v:0:27500:0:0:5047
-[1603]:11603:v:0:27500:0:0:5635
-[05e9]:11603:v:0:27500:0:0:1513
-Sky Box Office:11603:v:0:27500:0:0:4121
-Sky Box Office:11603:v:0:27500:0:0:4122
-Sky Box Office:11603:v:0:27500:0:0:4123
-1391:10935:v:0:22000:2321:2320:5421
-1392:10935:v:0:22000:2305:2320:5422
-1393:10935:v:0:22000:2306:2320:5423
-1394:10935:v:0:22000:2307:2320:5424
-1395:10935:v:0:22000:2308:2320:5425
-1396:10935:v:0:22000:2309:2320:5426
-1397:10935:v:0:22000:2310:2320:5427
-1398:10935:v:0:22000:2311:2320:5428
-1399:10935:v:0:22000:2312:2320:5429
-1471:10935:v:0:22000:2305:2313:5471
-1472:10935:v:0:22000:2306:2314:5472
-1473:10935:v:0:22000:2307:2315:5473
-1474:10935:v:0:22000:2308:2316:5474
-1475:10935:v:0:22000:2309:2317:5475
-1476:10935:v:0:22000:2310:2318:5476
-1477:10935:v:0:22000:2311:2319:5477
-1478:10935:v:0:22000:2312:2320:5478
-[05ea]:10935:v:0:22000:0:0:1514
-1326:10935:v:0:22000:0:0:5307
-1334:10935:v:0:22000:0:0:5310
-SPl:10935:v:0:22000:0:0:5404
-rc:10935:v:0:22000:0:0:5407
-nata:10935:v:0:22000:0:0:5466
-natd:10935:v:0:22000:0:0:5467
-ISM Sky News v6:11507:h:0:27500:2305:2306:9318
-ISM Movies v6:11507:h:0:27500:0:0:9319
-EIA2 Test:11507:h:0:27500:2305:2306:9322
-UK Online test:11507:h:0:27500:0:0:9323
-1784:11507:h:0:27500:2305:2306:9324
-1786:11507:h:0:27500:0:0:9325
-SCS:11507:h:0:27500:0:0:9326
-STT:11507:h:0:27500:2305:2306:9327
-1787:11507:h:0:27500:2305:2306:9329
-5ADT:11507:h:0:27500:2305:2306:9331
-EIA2 Test 6:11507:h:0:27500:2305:2306:9332
-8N2:11507:h:0:27500:0:0:9335
-EIA2 Test 5:11507:h:0:27500:2305:2306:9336
-[2479]:11507:h:0:27500:0:0:9337
-[247a]:11507:h:0:27500:0:0:9338
-7909:11507:h:0:27500:2305:2306:3909
-EIA2 Test 3:11507:h:0:27500:2305:2306:4909
-EIA2 Test 4:11507:h:0:27500:2305:2306:4912
-ISM Test1 v5:11507:h:0:27500:2305:2306:5902
-PlayJam:11507:h:0:27500:0:2445:9306
-PlayMonteCarlo & Roulette:11507:h:0:27500:0:2457:9308
-PlayJam test:11507:h:0:27500:0:2445:9310
-ISM Sky One v6:11507:h:0:27500:2305:2306:9316
-ISM Sports 1 v6:11507:h:0:27500:2305:2306:9317
-[05f3]:11507:h:0:27500:0:0:1523
-Playboy / Adult:11507:h:0:27500:0:0:4128
-Playboy TV:11507:h:0:27500:0:0:4131
-Private Girls:11507:h:0:27500:0:0:4133
-XXX TV:11507:h:0:27500:0:0:4134
-Amateur Babes:11507:h:0:27500:0:0:4135
-[1207]:11507:h:0:27500:0:0:4615
-[1209]:11507:h:0:27500:0:0:4617
-[232d]:11507:h:0:27500:0:0:9005
-YO-YO" test:11507:h:0:27500:0:0:9309
-UCB TV:12070:h:0:27500:2313:2314:52001
-ATN:12070:h:0:27500:2310:2311:52002
-Overload:12070:h:0:27500:2306:2307:52003
-Golf Pro-Shop:12070:h:0:27500:2315:2316:52004
-You TV:12070:h:0:27500:2336:2337:52005
-Escape:12070:h:0:27500:2317:2318:52006
-52007:12070:h:0:27500:2324:2325:52007
-Get Lucky TV:12070:h:0:27500:2319:2320:52008
-[fffe]:12070:h:0:27500:0:0:65534
-Wonderful:12070:h:0:27500:2308:2309:52009
-Musicians Chnl:12070:h:0:27500:2326:2327:52010
-Rangers TV:12070:h:0:27500:2328:2329:52011
-Celtic TV:12070:h:0:27500:2330:2331:52012
-Advert Channel:12070:h:0:27500:2332:2333:52013
-LONDON TV:12070:h:0:27500:2334:2335:52014
-Pure Dance:12070:h:0:27500:0:2312:52025
-Club Asia:12070:h:0:27500:0:2305:52026
-Setanta Sports:12070:h:0:27500:0:0:52021
-Setanta Sports:12070:h:0:27500:0:0:52022
-Setanta PPV2:12070:h:0:27500:0:0:52032
-FilmFour:11565:v:0:27500:2320:2321:50500
-FilmFour +1:11565:v:0:27500:2323:2324:50505
-Film4 Weekly:11565:v:0:27500:2326:2327:50510
-E4:11565:v:0:27500:2329:2330:50515
-Game 6:11565:v:0:27500:0:2336:50540
-Game 7:11565:v:0:27500:0:2342:50541
-Game 8:11565:v:0:27500:0:2344:50542
-FF TEST1:11565:v:0:27500:2320:2321:50543
-PCNE Chinese:11565:v:0:27500:6144:6145:50550
-Bloomberg:11565:v:0:27500:2316:2317:50555
-[05f5]:11565:v:0:27500:0:0:1525
-SCRD4:10861:h:0:22000:0:0:8009
-SBZP:10861:h:0:22000:0:0:8059
-LMIN:10861:h:0:22000:0:0:8108
-TRLN:10861:h:0:22000:0:0:8116
-SCD2:10861:h:0:22000:0:0:8126
-DOMI:10861:h:0:22000:0:0:8145
-WINC:10861:h:0:22000:2325:2326:8164
-The Betting Zone:10861:h:0:22000:0:0:8186
-TLM(Browser):10861:h:0:22000:2342:2344:8888
-Disney Chnl:10861:h:0:22000:2308:2309:9001
-Disney Chnl +1:10861:h:0:22000:2313:2314:9002
-Toon Disney:10861:h:0:22000:2317:2318:9003
-Playhse Disney:10861:h:0:22000:2320:2321:9004
-The Betting Zone:10861:h:0:22000:2336:2338:50008
-[05f6]:10861:h:0:22000:0:0:1526
-ALTU:10861:h:0:22000:0:0:8087
-DCT2 (t51):10861:h:0:22000:0:0:8999
-DCT (t51):10861:h:0:22000:0:0:9000
-Sky Travel +1:10876:v:0:22000:2310:2318:3905
-Sky Travel Active Dummy:10876:v:0:22000:0:0:4911
-Sky Travel:10876:v:0:22000:2308:2309:5005
-5006:10876:v:0:22000:2308:2309:5006
-Sky Trvl Extra:10876:v:0:22000:2305:2306:9312
-[0602]:10876:v:0:22000:0:0:1538
-Tel Sell:12460:h:0:27500:2319:2320:50832
-mSync:12460:h:0:27500:0:0:50837
-NASN:12460:h:0:27500:2322:2323:50839
-Classics TV:12460:h:0:27500:2324:2325:50840
-Information TV:12460:h:0:27500:2326:2327:50841
-Wrestling Chnl:12460:h:0:27500:2329:2330:50842
-TWC Reloaded:12460:h:0:27500:2331:2332:50843
-FRIENDLY TV:12460:h:0:27500:2333:2334:50848
-McColls:12460:h:0:27500:0:2335:50851
-Moto:12460:h:0:27500:0:2336:50852
-Teds FM:12460:h:0:27500:0:2337:50853
-Topps FM:12460:h:0:27500:0:2338:50855
-Kiss:12460:h:0:27500:0:2339:50856
-Smash Hits!:12460:h:0:27500:0:2340:50857
-Kerrang:12460:h:0:27500:0:2341:50858
-The Hits:12460:h:0:27500:0:2342:50859
-Magic:12460:h:0:27500:0:2343:50860
-Q:12460:h:0:27500:0:2344:50861
-MOJO:12460:h:0:27500:0:2345:50862
-Heat:12460:h:0:27500:0:2346:50863
-GlobeCast:12460:h:0:27500:0:2347:50864
-PTV Prime:12460:h:0:27500:2315:2316:50865
-Fashion TV:12460:h:0:27500:0:0:50850
-Best Direct:12246:v:0:27500:2314:2315:53500
-BestDirect+:12246:v:0:27500:2316:2317:53505
-Dating Channel:12246:v:0:27500:2320:2321:53515
-Wine TV:12246:v:0:27500:2323:2324:53520
-Flaunt:12246:v:0:27500:2326:2327:53525
-Scuzz:12246:v:0:27500:2328:2329:53530
-The Amp:12246:v:0:27500:2330:2331:53535
-Radio Caroline:12246:v:0:27500:0:2332:53550
-Amrit Bani:12246:v:0:27500:0:2333:53551
-Desi Radio:12246:v:0:27500:0:2334:53552
-CalvaryRadio:12246:v:0:27500:0:2335:53553
-Apple FM:12246:v:0:27500:0:2336:53554
-TWR:12246:v:0:27500:0:2337:53555
-Spectrum 1:12246:v:0:27500:0:2338:53556
-RTE Europe:12246:v:0:27500:0:2339:53557
-WRN Europe:12246:v:0:27500:0:2340:53558
-Raaj Radio:12246:v:0:27500:0:2341:53559
-On Air:12246:v:0:27500:0:2342:53560
-53561:12246:v:0:27500:0:2306:53561
-PulseUnsignd:12246:v:0:27500:0:2343:53564
-53581:12246:v:0:27500:0:0:53581
-RTE One:10743:h:0:22000:2306:2307:9601
-RTE TWO:10743:h:0:22000:2309:2310:9602
-TG4:10743:h:0:22000:2312:2313:9603
-TV3:10743:h:0:22000:2315:2316:9605
-DW-TV:10743:h:0:22000:2318:2319:9606
-TVEi:10743:h:0:22000:2320:2321:9607
-RTE Radio 1:10743:h:0:22000:0:2322:9611
-RTE 2FM:10743:h:0:22000:0:2323:9612
-RTE R na G:10743:h:0:22000:0:2324:9613
-RTE Lyric fm:10743:h:0:22000:0:2325:9614
-BBC R5 Live:10802:h:0:22000:0:2338:6401
-ETV2:10802:h:0:22000:2304:2306:6407
-BBC 1 Wales:10802:h:0:22000:2304:2306:6411
-BBC 2W:10802:h:0:22000:2321:2323:6412
-BBC 1 Scotland:10802:h:0:22000:2311:2313:6421
-BBC 2 Scotland:10802:h:0:22000:2325:2327:6422
-BBC 2 NI:10802:h:0:22000:2329:2331:6432
-BBC R1:10802:h:0:22000:0:2333:6451
-BBC R2:10802:h:0:22000:0:2334:6452
-BBC R3:10802:h:0:22000:0:2335:6453
-BBC R4 FM:10802:h:0:22000:0:2336:6454
-BBC R4 LW:10802:h:0:22000:0:2337:6455
-BBC R Scot.:10802:h:0:22000:0:2339:6457
-BBC R Wales:10802:h:0:22000:0:2340:6458
-BBC R Ulster:10802:h:0:22000:0:2341:6459
-BBC Asian Nt.:10802:h:0:22000:0:2342:6460
-BBC World Sv.:10802:h:0:22000:0:2343:6461
-ETV3:10802:h:0:22000:0:2333:6462
-BBC 5L SportX:10802:h:0:22000:0:2344:6464
-BBC WS Extra:10802:h:0:22000:0:2345:6465
-1Xtra BBC:10802:h:0:22000:0:2347:6466
-BBC 6 Music:10802:h:0:22000:0:2346:6467
-BBC 7:10802:h:0:22000:0:2348:6468
-BBC R n Gael:10802:h:0:22000:0:2349:6469
-T4 STRM-0:10847:v:0:22000:2305:2306:6900
-T4 STRM-1:10847:v:0:22000:2320:2321:6901
-BBC PARL'MNT:10847:v:0:22000:2327:2328:6902
-BBC 1 East (W):10847:v:0:22000:2338:2339:6903
-BBC 1 CI:10847:v:0:22000:2343:2344:6904
-T4 DEV-0:10847:v:0:22000:2305:2306:6990
-T4 DEV-1:10847:v:0:22000:2320:2321:6991
-T4 DEV-2:10847:v:0:22000:2327:2328:6992
-T4 DEV-3:10847:v:0:22000:2338:2339:6993
-T4 DEV-4:10847:v:0:22000:2343:2344:6994
-BBC 1 W Mids:10788:v:0:22000:2305:2306:10301
-BBC 1 N West:10788:v:0:22000:2318:2319:10302
-BBC 1 Yrks&Lin:10788:v:0:22000:2321:2322:10303
-BBC 1 Yorks:10788:v:0:22000:2324:2325:10304
-BBC 1 E Mids:10788:v:0:22000:2327:2328:10305
-BBC 1 East (E):10788:v:0:22000:2330:2331:10306
-ETV5:10788:v:0:22000:2305:2306:10321
-BBC 1 West:10817:v:0:22000:2305:2306:10351
-BBC 1 S East:10817:v:0:22000:2317:2318:10352
-BBC 1 South:10817:v:0:22000:2320:2321:10353
-BBC 1 S West:10817:v:0:22000:2323:2324:10354
-BBC 1 NE & C:10817:v:0:22000:2326:2327:10355
-BBC 1 Oxford:10817:v:0:22000:2329:2330:10356
-ETV6:10817:v:0:22000:2305:2306:10371
-POP:11426:v:0:27500:2311:2312:52500
-3751 PH:11426:v:0:27500:2311:2312:52501
-Chart Show TV:11426:v:0:27500:2309:2310:52505
-3761 PH:11426:v:0:27500:2313:2314:52512
-The Vault:11426:v:0:27500:2322:2323:52515
-Chase-it.tv:11426:v:0:27500:2318:2319:52520
-OBE:11426:v:0:27500:2307:2308:52525
-Tiny Pop:11426:v:0:27500:2316:2317:52530
-Spice Extreme:11426:v:0:27500:2320:2321:52561
-Climax3 - 1:11426:v:0:27500:2324:2325:52562
-Climax3 - 2:11426:v:0:27500:2326:2327:52563
-Climax3 - 3:11426:v:0:27500:2328:2329:52564
-Adult Channel:11426:v:0:27500:2330:2331:52565
-Playboy TV:11426:v:0:27500:2313:2314:52566
-52567:11426:v:0:27500:2330:2331:52567
-3911 PH:11426:v:0:27500:2320:2321:52581
-Simply Home:11488:v:0:27500:2364:2365:50102
-DTPCad4:11488:v:0:27500:2315:2316:50103
-Shop Vector:11488:v:0:27500:2322:2323:50105
-Simply Ideas:11488:v:0:27500:2324:2325:50115
-Simply Shop.:11488:v:0:27500:2353:2354:50120
-JobsTV:11488:v:0:27500:2366:2367:50125
-GayDateTV:11488:v:0:27500:2361:2362:50130
-Motors TV:11488:v:0:27500:3329:3330:50135
-nation217:11488:v:0:27500:2329:2330:50170
-52536:11488:v:0:27500:2353:2354:50176
-3786 PH:11488:v:0:27500:2342:2343:50177
-Avago Roulette:11488:v:0:27500:0:0:50180
-50181:11488:v:0:27500:2353:2354:50181
-XplicitXXX:11488:v:0:27500:0:0:50175
-3901 PH:11584:h:0:27500:2348:2349:50101
-50621:11584:h:0:27500:0:0:50621
-Gay TV:11584:h:0:27500:2333:2334:50671
-Red Hot Films:11584:h:0:27500:2338:2339:50672
-Red Hot Euro:11584:h:0:27500:2336:2337:50673
-Television X 2:11584:h:0:27500:2326:2327:50674
-Television X 3:11584:h:0:27500:2314:2315:50675
-Television X:11584:h:0:27500:2306:2307:50676
-RedHot All Girl:11584:h:0:27500:2340:2341:50677
-ExpressShop.:11584:h:0:27500:2331:2332:50678
-Real Estate TV:11584:h:0:27500:2329:2330:50679
-Red Hot Only 18:11584:h:0:27500:2311:2312:50680
-Red Hot Wives:11584:h:0:27500:2344:2345:50681
-RH 40+ Wives:11584:h:0:27500:2346:2347:50682
-redhot amateur:11584:h:0:27500:2342:2343:50683
-redhot uktalent:11584:h:0:27500:0:0:50100
-50686:11584:h:0:27500:0:0:50686
-AvaTest:11546:h:0:27500:2319:2320:50446
-SFI:11546:h:0:27500:0:0:50455
-Shop on TV:11546:h:0:27500:2315:2316:50400
-Thane Direct:11546:h:0:27500:2317:2318:50405
-AVAGO:11546:h:0:27500:2319:2320:50410
-SouthForYou:11546:h:0:27500:2313:2314:50420
-Stop + Shop:11546:h:0:27500:2324:2325:50430
-VHR:11546:h:0:27500:2326:2327:50435
-ditg:11546:h:0:27500:0:0:50439
-cso:11546:h:0:27500:2331:2332:50440
-Channel 425:11546:h:0:27500:2355:2357:50445
-Thomas Cook:11526:v:0:27500:2312:2313:50300
-B4:11526:v:0:27500:2361:2362:50305
-Al Jazeera:11526:v:0:27500:2310:2311:50325
-NHS 1:11526:v:0:27500:2314:2315:50370
-NHS 2:11526:v:0:27500:0:2329:50371
-NHS 2:11526:v:0:27500:0:2337:50372
-NHS Direct Interactive:11526:v:0:27500:0:0:50373
-NHS 4:11526:v:0:27500:2345:2347:50374
-SAB TV:11388:h:0:27500:2310:2311:52401
-Performance:11388:h:0:27500:2312:2313:52402
-channel U:11388:h:0:27500:2314:2315:52403
-Gems.tv:11388:h:0:27500:2317:2318:52404
-Soundtrack ch.:11388:h:0:27500:2307:2308:52405
-HorrorChannel:11388:h:0:27500:2342:2343:52406
-Chat Box:11388:h:0:27500:2319:2320:52407
-Golf Channel:11388:h:0:27500:2321:2322:52408
-Ex&Mart TV:11388:h:0:27500:2323:2324:52409
-TVW Select:11388:h:0:27500:2305:2306:52412
-Game In TV:11388:h:0:27500:2335:2336:52414
-Majestic TV:11388:h:0:27500:2340:2341:52415
-52421:11388:h:0:27500:0:0:52421
-18PlusXXX:11388:h:0:27500:0:0:52410
-XXXHousewive:11388:h:0:27500:0:0:52411
-Open Access 2:11642:v:0:27500:2312:2318:50152
-Unlimited TV:11642:v:0:27500:2319:2320:50153
-Racing UK:11642:v:0:27500:2306:2313:50951
-Vectone Bangla:11642:v:0:27500:2325:2326:50952
-VECTONE Urdu:11642:v:0:27500:2328:2329:50953
-VECTONE Tamil:11642:v:0:27500:2331:2332:50954
-VECTONE Bolly:11642:v:0:27500:2334:2335:50955
-Open Access:11642:v:0:27500:2356:2357:50956
-Classic FM TV:11642:v:0:27500:2358:2359:50957
-50959:11642:v:0:27500:2314:2315:50959
-Extreme Sports:11680:v:0:27500:2307:2308:51101
-EuroNews:11680:v:0:27500:2310:2311:51102
-GOD Channel:11680:v:0:27500:2319:2320:51103
-GOD REVIVAL:11680:v:0:27500:2321:2322:51104
-CrossRhythm:11680:v:0:27500:0:2306:51106
-Life TV:11680:v:0:27500:2323:2324:51108
-TBN Europe:11680:v:0:27500:2325:2326:51109
-HollywoodTV:11680:v:0:27500:2327:2328:51112
-GOD 2:11680:v:0:27500:2321:2322:51115
-revelation:11680:v:0:27500:2339:2340:51116
-Live XXX TV:11680:v:0:27500:0:0:51113
-51117:11680:v:0:27500:0:0:51117
-Alphameric1:11680:v:0:27500:0:0:51121
-Alphameric2:11680:v:0:27500:0:0:51122
-CFC TV:11680:v:0:27500:0:0:51105
-mta-muslim tv:11661:h:0:27500:2311:2312:51001
-BEN:11661:h:0:27500:2327:2328:51008
-Abu Dhabi TV:11661:h:0:27500:2329:2330:51009
-TV Travelshop 2:11661:h:0:27500:2370:2371:51010
-CCTV-9:11661:h:0:27500:2333:2334:51011
-Islam Channel:11661:h:0:27500:2337:2338:51014
-51020:11661:h:0:27500:0:2339:51020
-PlayMonteCarlo & Roulette:11661:h:0:27500:0:2319:51022
-2gbstp:11661:h:0:27500:0:0:51013
-Tel Sell:11623:h:0:27500:2319:2320:50832
-mSync:11623:h:0:27500:0:0:50837
-NASN:11623:h:0:27500:2322:2323:50839
-Classics TV:11623:h:0:27500:2324:2325:50840
-Information TV:11623:h:0:27500:2326:2327:50841
-Wrestling Chnl:11623:h:0:27500:2329:2330:50842
-TWC Reloaded:11623:h:0:27500:2331:2332:50843
-FRIENDLY TV:11623:h:0:27500:2333:2334:50848
-McColls:11623:h:0:27500:0:2335:50851
-Moto:11623:h:0:27500:0:2336:50852
-Teds FM:11623:h:0:27500:0:2337:50853
-Topps FM:11623:h:0:27500:0:2338:50855
-Kiss:11623:h:0:27500:0:2339:50856
-Smash Hits!:11623:h:0:27500:0:2340:50857
-Kerrang:11623:h:0:27500:0:2341:50858
-The Hits:11623:h:0:27500:0:2342:50859
-Magic:11623:h:0:27500:0:2343:50860
-Q:11623:h:0:27500:0:2344:50861
-MOJO:11623:h:0:27500:0:2345:50862
-Heat:11623:h:0:27500:0:2346:50863
-GlobeCast:11623:h:0:27500:0:2347:50864
-PTV Prime:11623:h:0:27500:2315:2316:50865
-Fashion TV:11623:h:0:27500:0:0:50850
-ITV1 London:10832:h:0:22000:2305:2307:10000
-ITV News:10832:h:0:22000:2329:2336:10009
-ITV1 Central:10832:h:0:22000:2327:2328:10010
-ITV1 HTV Wales:10832:h:0:22000:2334:2335:10020
-ITV1 HTV West:10832:h:0:22000:2341:2342:10030
-ITV1 W Country:10832:h:0:22000:2348:2349:10040
-G49:10832:h:0:22000:2334:2335:10099
-ITV1 Anglia:10891:h:0:22000:2305:2306:10100
-ITV1 Border:10891:h:0:22000:2327:2328:10110
-ITV1 BorderSco:10891:h:0:22000:2334:2335:10120
-ITV1 Meridian S:10891:h:0:22000:2348:2349:10140
-ITV1 Meridian E:10891:h:0:22000:2341:2342:10141
-ITV1 Tyne Tees:10891:h:0:22000:2355:2356:10150
-ITV1 Yorkshire:10891:h:0:22000:2362:2363:10160
-G53:10891:h:0:22000:2334:2335:10199
-ITV Channel Is:10906:v:0:22000:2326:2328:10200
-Grampian TV:10906:v:0:22000:2333:2334:10210
-Scottish TV:10906:v:0:22000:2340:2341:10220
-UTV:10906:v:0:22000:2347:2348:10230
-ITV2:10906:v:0:22000:2350:2351:10240
-ITV1 Granada:10906:v:0:22000:2305:2306:10250
-ITV3:10906:v:0:22000:2363:2364:10260
-G54:10906:v:0:22000:2357:2358:10299
-6300:10758:v:0:22000:2305:2306:10119
-LONDON TV:11222:h:0:27500:2334:2335:52014
-Setanta Sports:11222:h:0:27500:0:0:52021
-Setanta Sports:11222:h:0:27500:0:0:52022
-Pure Dance:11222:h:0:27500:0:2312:52025
-Club Asia:11222:h:0:27500:0:2305:52026
-Setanta PPV2:11222:h:0:27500:0:0:52032
-[fffe]:11222:h:0:27500:0:0:65534
-UCB TV:11222:h:0:27500:2313:2314:52001
-ATN:11222:h:0:27500:2310:2311:52002
-Overload:11222:h:0:27500:2306:2307:52003
-Golf Pro-Shop:11222:h:0:27500:2315:2316:52004
-You TV:11222:h:0:27500:2336:2337:52005
-Escape:11222:h:0:27500:2317:2318:52006
-52007:11222:h:0:27500:2324:2325:52007
-Get Lucky TV:11222:h:0:27500:2319:2320:52008
-Wonderful:11222:h:0:27500:2308:2309:52009
-Musicians Chnl:11222:h:0:27500:2326:2327:52010
-Rangers TV:11222:h:0:27500:2328:2329:52011
-Celtic TV:11222:h:0:27500:2330:2331:52012
-Advert Channel:11222:h:0:27500:2332:2333:52013
-E4+1:10729:v:0:22000:2306:2307:8300
-3310:10729:v:0:22000:2317:2318:8310
-3315:10729:v:0:22000:0:0:8315
-3320:10729:v:0:22000:0:0:8320
-[fffe]:11264:h:0:22000:0:0:65534
-52101:11264:h:0:22000:2305:2306:52101
-52102:11264:h:0:22000:2307:2308:52102
-52103:11264:h:0:22000:2309:2310:52103
-52104:11264:h:0:22000:2311:2312:52104
-IDMT:11307:h:0:27500:2307:2308:52200
- Broadband UK:11307:h:0:27500:2305:2306:52210
-52220:11307:h:0:27500:2309:2310:52220
-Trouble Reload:11307:h:0:27500:2311:2312:52230
-Challenge+1:11307:h:0:27500:2314:2315:52232
-Ftn:11307:h:0:27500:0:0:52231
diff --git a/channels-conf/dvb-s/BrasilSat-B3-84.0W b/channels-conf/dvb-s/BrasilSat-B3-84.0W
deleted file mode 100644
index b3632bb8..00000000
--- a/channels-conf/dvb-s/BrasilSat-B3-84.0W
+++ /dev/null
@@ -1,39 +0,0 @@
-NoName:3675:v:0:4285:1110:1211:1
-Rede 21:3688:v:0:2308:308:256:1
-SNG#3 TERRA VIVA:3692:v:0:3200:308:256:1
-TV PONTA PORA :3697:v:0:3333:1110:1211:1
-Servico 1:3710:v:0:12960:36:37:1
-TV Assembleia:3710:v:0:12960:39:40:2
-Servico 3:3710:v:0:12960:42:43:3
-TV Cultura:3710:v:0:12960:33:34:4
-TV Ra-Tim-Bum:3710:v:0:12960:45:46:5
-Tv Morena:3738:v:0:4710:4096:4097:1
-[6d65]:3754:v:0:5000:0:0:28005
-[6dc9]:3754:v:0:5000:0:0:28105
-[0faa]:3754:v:0:5000:0:0:4010
-[0fb4]:3754:v:0:5000:0:0:4020
-[6d61]:3754:v:0:5000:0:0:28001
-[0f9f]:3754:v:0:5000:0:0:3999
-[0fbe]:3754:v:0:5000:0:0:4030
-[000b]:3754:v:0:5000:0:0:11
-[5014]:3754:v:0:5000:0:0:20500
-STV:3768:v:0:8000:160:80:1
-CANAL 2:3768:v:0:8000:161:84:2
-TELECONF:3768:v:0:8000:162:88:3
-REDETV RO:3805:v:0:3255:4194:4195:1
-Videocom:3858:v:0:4289:1110:1211:1
-TVSULBAHIA:3911:v:0:3255:33:36:2
-TV ARATU BA:3927:v:0:3255:33:36:2
-TV BAND BA:3931:h:0:3255:337:340:21
-TV BAND BA:3932:v:0:3255:337:340:21
-REDE SUPER:3940:v:0:3255:337:340:1
-RBI:3949:v:0:4340:337:340:33
-TV TRIBUNA:3955:v:0:4340:337:340:1
-5 :3970:v:0:4445:1160:1120:1
-TV EDUCATIVA MS:4013:v:0:3255:337:340:33
-TV Justica:4060:v:0:3330:289:290:1
-CNT GERACAO 1:4075:v:0:4444:289:290:20101
-ASS-LEG-SC:4132:v:0:2532:337:340:33
-EMBRATEL 21:4152:v:0:2300:257:514:1
-SEXY TV:4155:v:0:2170:257:258:1
-BASA:4169:v:0:8140:4141:4140:4
diff --git a/channels-conf/dvb-t/au-Adelaide b/channels-conf/dvb-t/au-Adelaide
deleted file mode 100644
index fc970718..00000000
--- a/channels-conf/dvb-t/au-Adelaide
+++ /dev/null
@@ -1,28 +0,0 @@
-ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:592
-ABC TV Adelaide:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:593
-ABC TV 2:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:594
-ABC TV 3:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:595
-ABC TV 4:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:596
-ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2311:598
-7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1360
-7 Digital 1:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1361
-7 Digital 2:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1362
-7 Digital 3:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1281:1282:1363
-7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1345:1346:1364
-NINE Digital:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1105
-NINE HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:0:1112
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1617
-TEN Digital 1:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1618
-TEN Digital 2:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1619
-TEN Digital 3:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1620
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1621
-TEN Digital 4:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1622
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1623
-TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1624
-Ten Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1625
-SBS HD:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:832
-SBS DIGITAL 1:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:833
-SBS DIGITAL 2:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:834
-SBS EPG:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:835
-SBS RADIO 1:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:846
-SBS RADIO 2:564500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:847
diff --git a/channels-conf/dvb-t/au-Brisbane b/channels-conf/dvb-t/au-Brisbane
deleted file mode 100644
index 5eb08536..00000000
--- a/channels-conf/dvb-t/au-Brisbane
+++ /dev/null
@@ -1,29 +0,0 @@
-ABC HDTV:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:576
-ABC TV Brisbane:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:577
-ABC TV 2:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:578
-ABC TV 3:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:579
-ABC TV 4:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:580
-ABC DiG Radio:226500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2310:582
-7 Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1344
-7 Digital 1:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1345
-7 Digital 2:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1346
-7 Digital 3:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1025:1026:1347
-7 HD Digital:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1089:1090:1348
-Nine Digital:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:660:1025
-Nine Guide:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:660:1030
-Nine High Definition:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1152
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1601
-TEN Digital 1:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1602
-TEN Digital 2:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1603
-TEN Digital 3:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1604
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1605
-TEN Digital 4:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1606
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1607
-TEN HD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1608
-TEN Digital:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1609
-SBS HD:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:816
-SBS DIGITAL 1:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:817
-SBS DIGITAL 2:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:818
-SBS EPG:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:819
-SBS RADIO 1:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:830
-SBS RADIO 2:585625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:831
diff --git a/channels-conf/dvb-t/au-Hobart b/channels-conf/dvb-t/au-Hobart
deleted file mode 100644
index 80edcb06..00000000
--- a/channels-conf/dvb-t/au-Hobart
+++ /dev/null
@@ -1,18 +0,0 @@
-ABC HDTV:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2314:0:624
-ABC TV Hobart:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:625
-ABC2:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2309:2310:626
-ABC TV:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:627
-ABC DiG Radio:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2317:630
-ABC DiG Jazz:191625000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2318:631
-SBS HD:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:848
-SBS DIGITAL 1:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:849
-SBS DIGITAL 2:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:850
-SBS EPG:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:851
-SBS RADIO 1:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:862
-SBS RADIO 2:205500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:863
-SCT Hobart:212500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:625:626:2306
-SCT - HD:212500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3611:0:2338
-WIN TELEVISION:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:116:117:1
-WIN HD:184500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:129:130:10
-TDT - SD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:657:658:2071
-TDT - HD:219500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3511:0:2103
diff --git a/channels-conf/dvb-t/au-Melbourne b/channels-conf/dvb-t/au-Melbourne
deleted file mode 100644
index 0b0542f4..00000000
--- a/channels-conf/dvb-t/au-Melbourne
+++ /dev/null
@@ -1,17 +0,0 @@
-ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:2308:560
-ABC TV Melbourne:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:561
-ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2310:566
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1585
-TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1592
-Nine Digital:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:519:720:1072
-Nine Digital HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1073
-Nine Guide:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:700:1074
-7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1328
-7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:833:834:1332
-7 Program Guide:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:865:866:1334
-SBS HD:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:784
-SBS DIGITAL 1:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:785
-SBS DIGITAL 2:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:786
-SBS EPG:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:787
-SBS RADIO 1:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:798
-SBS RADIO 2:536625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:799
diff --git a/channels-conf/dvb-t/cz-Praha b/channels-conf/dvb-t/cz-Praha
deleted file mode 100644
index 4a5c16c7..00000000
--- a/channels-conf/dvb-t/cz-Praha
+++ /dev/null
@@ -1,16 +0,0 @@
-CT2.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:512:650:1
-Nova.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:661:2
-CT1.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2325:2326:3
-Prima.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:514:671:4
-Stanice O.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2322:2323:5
-Radiozurnal.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:652:6
-Praha.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:653:7
-Vltava.:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:651:8
-iTV:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:9
-Prima:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:161:84:1
-CT2:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:164:96:4
-TV Program:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2501:2502:5
-RADIO2:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2832:6
-RADIO:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2831:9
-Proglas:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:180:11
-Nova.:674000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:205:206:3
diff --git a/channels-conf/dvb-t/de-Berlin b/channels-conf/dvb-t/de-Berlin
deleted file mode 100644
index 69cd114a..00000000
--- a/channels-conf/dvb-t/de-Berlin
+++ /dev/null
@@ -1,47 +0,0 @@
-rbb Brandenburg:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1101:1102:11
-rbb Berlin:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1201:1202:12
-Phoenix:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1301:1302:13
-Das Erste:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1401:1402:14
-ARD-MHP-Data:522000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16
-ZDF:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:514
-Info/3sat:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:561:562:515
-Doku/KiKa:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:593:594:517
-SAT.1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:385:386:16408
-N24:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:225:226:16398
-ProSieben:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:305:306:16403
-KABEL1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:162:16394
-MDR FERNSEHEN:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:101:102:1
-ARD-Online-Kanal:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:10
-ARD-MHP-Data:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:9
-NDR FERNSEHEN:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:301:302:3
-arte:191500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:201:202:2
-Test Programm:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3841:3842:16624
-SUD enhanced:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16650
-13 TH STREET:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:4273:4274:16651
-BMCO Nokia IPDC Signalling:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16652
-BMCO Nokia IPDC 1:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16653
-BMCO Nokia IPDC 2:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16654
-BMCO Nokia IPDC 3:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16655
-IP Services:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16640
-Media Broadcast Services:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16641
-SUD:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16642
-SUD 1:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16643
-Kathrein Download:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16644
-HUMAX DOWNLOAD SVC:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16645
-BMCO Nokia IPDC 4:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16656
-BMCO Nokia IPDC 5:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16657
-BMCO Nokia IPDC 6:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16658
-BMCO Nokia IPDC 7:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16659
-BMCO Nokia IPDC 8:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16660
-RTL:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:337:338:16405
-RTL2:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:353:354:16406
-Super RTL:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:433:434:16411
-VOX:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:16418
-Südwest BW/RP:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:257:258:16
-WDR:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:241:242:15
-BBC World:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:49:50:16387
-FAB:177500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3073:3074:16576
-DSF:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:129:130:16392
-Testkanal NEUN LIVE:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:273:274:16401
-VIVA Plus:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:529:530:16417
-Eurosport:754000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:577:578:16420
diff --git a/channels-conf/dvb-t/de-Braunschweig b/channels-conf/dvb-t/de-Braunschweig
deleted file mode 100644
index 28fb4a65..00000000
--- a/channels-conf/dvb-t/de-Braunschweig
+++ /dev/null
@@ -1,25 +0,0 @@
-arte:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsExtra:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:4
-Das Erste:198500000:INVERSION_AUTO:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:128
-ZDF:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-RTL Television:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:498000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-hr-fernsehen:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:65
-MDR FERNSEHEN:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:129
-NDR FS HH *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:130
-NDR FS SH *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:131
-NDR FS MVP *:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:132
-WDR Köln:594000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:262
-SAT.1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-N24:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:658000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-Eurosport:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-TELE 5:786000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:465:466:16413
diff --git a/channels-conf/dvb-t/de-Bremen b/channels-conf/dvb-t/de-Bremen
deleted file mode 100644
index 0826f31d..00000000
--- a/channels-conf/dvb-t/de-Bremen
+++ /dev/null
@@ -1,25 +0,0 @@
-arte:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:202:2
-Phoenix:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:3
-NDR RB:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:518:519:161
-Das Erste RB:482000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:261:262:160
-hr-fernsehen:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:65
-MDR FERNSEHEN:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:129
-NDR FS HH *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:130
-NDR FS SH *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:131
-NDR FS MVP *:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:132
-WDR Köln:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:262
-ZDF:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:562000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-RTL Television:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:642000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-Eurosport:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-TELE 5:666000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:465:466:16413
-SAT.1:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-N24:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
diff --git a/channels-conf/dvb-t/de-Koeln-Bonn b/channels-conf/dvb-t/de-Koeln-Bonn
deleted file mode 100644
index 199ca858..00000000
--- a/channels-conf/dvb-t/de-Koeln-Bonn
+++ /dev/null
@@ -1,23 +0,0 @@
-RTL Television:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:433:434:16411
-VOX:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-ZDF:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:514000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-MDR Fernsehen:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4657:4658:100
-NDR FS NDS:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4641:4642:129
-SÃœDWEST RP:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4673:4674:226
-WDR Köln:698000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4625:4626:262
-N24:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-ProSieben:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-KABEL1:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-SAT.1:650000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:2078:2077:16408
-arte:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsMuXx:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:6
-Das Erste:826000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:256
-Eurosport:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-VIVA:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:513:514:16416
-TERRA NOVA:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-CNN Int.:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:97:98:16390
diff --git a/channels-conf/dvb-t/de-Leipzig b/channels-conf/dvb-t/de-Leipzig
deleted file mode 100644
index 9173a6fd..00000000
--- a/channels-conf/dvb-t/de-Leipzig
+++ /dev/null
@@ -1,7 +0,0 @@
-# channels.conf for DVB-T - Leipzig (Germany) Transmitter
-# Generated by Albrecht Lohoefener <albrechtloh@gmx.de>
-
-MDR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1553:1554:97
-rbb:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:2833:2834:177
-WDR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:4193:4194:262
-BR:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:529:530:33
diff --git a/channels-conf/dvb-t/de-Luebeck b/channels-conf/dvb-t/de-Luebeck
deleted file mode 100644
index 257f139d..00000000
--- a/channels-conf/dvb-t/de-Luebeck
+++ /dev/null
@@ -1,22 +0,0 @@
-ZDF:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:545:546:514
-Info/3sat:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:561:562:515
-Doku/KiKa:490000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:593:594:517
-Bayerisches Fernsehen:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5185:5186:34
-MDR FERNSEHEN:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5169:5170:100
-NDR FS NDS *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:129
-NDR FS HH *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:130
-NDR FS SH:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:131
-NDR FS MVP *:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5137:5138:132
-WDR Köln:530000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:5153:5154:262
-N24:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:225:226:16398
-ProSieben:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:305:306:16403
-KABEL1:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:161:162:16394
-SAT.1:546000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_1_2:FEC_AUTO:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:385:386:16408
-arte:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsExtra:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:4
-Das Erste:570000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:128
-RTL Television:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:369:370:16407
-VOX:626000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
diff --git a/channels-conf/dvb-t/de-Rhein-Main b/channels-conf/dvb-t/de-Rhein-Main
deleted file mode 100644
index 32d4edc7..00000000
--- a/channels-conf/dvb-t/de-Rhein-Main
+++ /dev/null
@@ -1,6 +0,0 @@
-c8:198500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c22:482000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c34:578000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c54:738000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c57:762000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
-c64:818000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:82
diff --git a/channels-conf/dvb-t/de-Ruhrgebiet b/channels-conf/dvb-t/de-Ruhrgebiet
deleted file mode 100644
index 029dcd7e..00000000
--- a/channels-conf/dvb-t/de-Ruhrgebiet
+++ /dev/null
@@ -1,46 +0,0 @@
-# channels.conf for dvb-t in germany, broadcasting area 'Duesseldorf/Ruhrgebiet'.
-# see
-# http://nrw.ueberallfernsehen.de/fileadmin/downloads/Programm_Ruhr_2005_04_04_final.pdf
-# for details on the regional availability of some channels (see the comments below).
-#
-RTL Television:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:337:338:16405
-RTL2:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:353:354:16406
-Super RTL:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:433:434:16411
-VOX:538000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:16418
-ZDF:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:545:546:514
-Info/3sat:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:561:562:515
-Doku/KiKa:586000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:593:594:517
-CNN Int.:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:97:98:16390
-VIVA:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:513:514:16416
-Eurosport:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:577:578:16420
-TERRA NOVA:722000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:609:610:16422
-ProSieben:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:305:306:16403
-SAT.1:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:385:386:16408
-KABEL1:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:162:16394
-N24:746000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:225:226:16398
-arte:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4385:4386:2
-Phoenix:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4401:4402:3
-EinsMuXx:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4417:4418:6
-Das Erste:818000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4369:4370:256
-##
-### regionale Sender/regional channels
-##
-## Kanal 25; Senderstandorte/broadcasting locations: Langenberg, Dortmund
-MDR FERNSEHEN-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5425:5426:100
-NDR FS NDS-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5409:5410:129
-SUEDWEST RP-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5441:5442:226
-WDR Dortmund-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5393:5394:259
-WDR Essen-25:506000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5393:5394:261
-#
-## Kanal 46; Senderstandorte/broadcasting locations: Duesseldorf, Wesel, Langenberg
-MDR FERNSEHEN-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4913:4914:100
-NDR FS NDS-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4897:4898:129
-SUEDWEST RP-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4929:4930:226
-WDR Duesseldorf-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4881:4882:260
-WDR Wuppertal-46:674000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:4881:4882:265
-## Kanal 59; Senderstandorte/broadcasting locations: Essen
-MDR FERNSEHEN-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5169:5170:100
-NDR FS NDS-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5153:5154:129
-SUEDWEST RP-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5185:5186:226
-WDR Dortmund-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5137:5138:259
-WDR Essen-59:778000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:5137:5138:261
diff --git a/channels-conf/dvb-t/es-Alpicat b/channels-conf/dvb-t/es-Alpicat
deleted file mode 100644
index e69158ce..00000000
--- a/channels-conf/dvb-t/es-Alpicat
+++ /dev/null
@@ -1,19 +0,0 @@
-#channels.conf for DVB-T - Alpicat (Lleida) Transmitter
-
-#C42
-TV3:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:642000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
-
-#C58
-TVE 1:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
-TVE 2:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
-ANTENA 3:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
-CANAL+:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
-TELECINCO:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
-
-#C66
-Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
-Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
diff --git a/channels-conf/dvb-t/es-Madrid b/channels-conf/dvb-t/es-Madrid
deleted file mode 100644
index 7066e7b9..00000000
--- a/channels-conf/dvb-t/es-Madrid
+++ /dev/null
@@ -1,26 +0,0 @@
-TVE 1:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:380
-TVE 2:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:381
-24H TVE:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1003:382
-RNE1:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2001:385
-RNEC:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2011:386
-CLAN/50 TVE:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1503:383
-RNE3:770000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:2021:387
-TM3:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:113:421
-LAOTRA:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:211:212:422
-ONDA6:810000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:311:312:423
-TELEDEPORTE:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:100
-VEO TV:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1002:260
-VEO 2:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:261
-NET TV:834000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1502:300
-CUATRO:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:160:80:1057
-CNN+:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:161:84:1058
-40 LATINO:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:162:88:1059
-LA SEXTA 1:842000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:0:340
-T5 Estrellas:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:301:181
-T5 Sport:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:202:302:182
-Telecinco:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:203:303:180
-FLYMUSIC:850000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:1502:301
-antena 3:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:140
-a3.neox:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:141
-a3.nova:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1001:1003:142
-La Sexta 2:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:1501:0:341
diff --git a/channels-conf/dvb-t/es-Mussara b/channels-conf/dvb-t/es-Mussara
deleted file mode 100644
index 7962324a..00000000
--- a/channels-conf/dvb-t/es-Mussara
+++ /dev/null
@@ -1,19 +0,0 @@
-#channels.conf for DVB-T - La Mussara (Reus-Tarragona) Transmitter
-
-#C56
-TV3:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
-
-#C59
-TVE 1:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
-TVE 2:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
-ANTENA 3:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
-CANAL+:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
-TELECINCO:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
-
-#C66
-Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
-Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
diff --git a/channels-conf/dvb-c/de-Berlin b/channels.conf-dvbc-berlin
index 0f2cafd4..7fb05a57 100644
--- a/channels-conf/dvb-c/de-Berlin
+++ b/channels.conf-dvbc-berlin
@@ -1,7 +1,7 @@
3sat:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:210:220
ARD-Online-Kanal:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1805
CNBC:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:510:520
-DLF-Köln:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:810
+DLF-Köln:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:810
DLR-Berlin:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:710
EinsExtra:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:101:102
EinsFestival:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:201:202
@@ -20,8 +20,8 @@ RADIOmultikulti:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1301
Radio 3:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:701
SFB1:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:601:602
SWR2:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1401
-SÃœDWEST BW:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:801:802
-SÃœDWEST RP:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:3101:3102
+SÜDWEST BW:410000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:801:802
+SÜDWEST RP:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:3101:3102
WDR 3:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1501
WDR 5:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1601
ZDF:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:110:120
@@ -31,7 +31,7 @@ ZDFinfokanal:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:610:620
ZDFtheaterkanal:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
JUMP:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1001
SPUTNIK:426000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:1201
-Österreich 1:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:169
+Österreich 1:394000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:169
ATV 2:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:631:632
ATV 2:434000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:631:632
Adagio:442000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
@@ -153,7 +153,7 @@ HEIMATKANAL:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1535:1536
HIP HOP/R&B:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:576
JUNIOR:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:255:256
K-TOON:354000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:0
-KLASSIK POPULÄR:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:624
+KLASSIK POPULÄR:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:624
KRIMI &CO:378000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:1535:1536
LOVE SONGS:370000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:592
NEW COUNTRY:362000000:INVERSION_OFF:6900000:FEC_NONE:QAM_64:0:384
diff --git a/channels.conf-dvbs-astra b/channels.conf-dvbs-astra
new file mode 100644
index 00000000..705f7103
--- /dev/null
+++ b/channels.conf-dvbs-astra
@@ -0,0 +1,226 @@
+Das Erste:11837:h:0:27500:101:102:1:28106
+ZDF:11954:h:0:27500:110:120:1:28006
+3sat:11954:h:0:27500:210:220:1:28007
+EinsMuXx:12110:h:0:27500:301:302:1:28203
+EinsFestival:12110:h:0:27500:201:202:1:28202
+EinsExtra:12110:h:0:27500:101:102:1:28201
+MDR FERNSEHEN:12110:h:0:27500:401:402:1:28204
+ORB-Fernsehen:12110:h:0:27500:501:502:1:28205
+B1 Berlin:12110:h:0:27500:601:602:1:28206
+SWR Fernsehen:11837:h:0:27500:801:802:1:28113
+SR Fernsehen Suedwes:11837:h:0:27500:501:502:1:28110
+hessen fernsehen:11837:h:0:27500:301:302:1:28108
+WDR FERNSEHEN:11837:h:0:27500:601:602:1:28111
+Bayerisches FS:11837:h:0:27500:201:202:1:28107
+N3:12110:h:0:27500:2401:2402:1:28224
+BR-alpha:11837:h:0:27500:701:702:1:28112
+KiKa:11954:h:0:27500:310:320:1:28008
+arte:11836:h:0:27500:401:402:1:28109
+ZDF Theaterkanal:11954:h:0:27500:1110:1120:1:28016
+ZDF.info:11954:h:0:27500:610:620:1:28011
+ZDF.doku:11954:h:0:27500:660:670:1:28014
+Phoenix:11837:h:0:27500:901:902:1:28114
+DW-tv:10786:v:0:21997:305:306:1:9005
+RTL Television:12188:h:0:27500:163:104:1:12003
+SAT.1:12480:v:0:27500:1791:1792:1:46
+ProSieben:12480:v:0:27500:255:256:1:898
+RTL2:12188:h:0:27500:166:128:1:12020
+Super RTL:12188:h:0:27500:165:120:1:12040
+KABEL1:12480:v:0:27500:511:512:1:899
+VOX:12188:h:0:27500:167:136:1:12060
+tm3:12480:v:0:27500:767:768:1:897
+Bloomberg TV Germany:12552:v:0:22000:162:99:1:12160
+EuroNews:11954:h:0:27500:2221:2233:1:28015
+N24:12480:v:0:27500:2047:2048:1:47
+n-tv:12670:v:0:22000:162:96:1:12730
+DSF:12480:v:0:27500:1023:1024:1:900
+Eurosport:11954:h:0:27500:410:420:1:28009
+Via 1 - Sch ner Re:12148:h:0:27500:511:512:1:44
+Home Order Tel:12480:v:0:27500:1279:1280:1:40
+QVC GERMANY:12552:v:0:22000:165:166:1:12100
+TW 1:12692:h:0:22000:166:167:1:13013
+Canal Canarias:12441:v:0:27500:513:681:1:29700
+ProSieben A:12051:v:0:27500:161:84:1:20002
+ProSieben CH:12051:v:0:27500:289:290:1:20001
+Kabel 1 Austria:12051:v:0:27500:166:167:1:20004
+Kabel 1 Schweiz:12051:v:0:27500:162:163:1:20003
+CNN Int.:12168:v:0:27500:165:100:1:28512
+Sky News:12552:v:0:22000:305:306:1:3995
+Travel:12168:v:0:27500:163:92:1:28001
+AB SAT / XXL:12266:h:0:27500:164:96:1:17004
+MOTEURS:12266:h:0:27500:160:80:1:17000
+HOT GM:12148:h:0:27500:767:768:1:45
+KTO:12129:v:0:27500:170:120:1:8411
+LA CINQUIEME:12207:v:0:27500:160:80:1:8501
+LCP:12207:v:0:27500:165:100:1:8506
+LibertyTV.com:12611:v:0:22000:941:942:1:12280
+TV5 Europe:12611:v:0:22000:45:46:1:12240
+Motors TV:12611:v:0:22000:191:194:1:12300
+Wishline:12611:v:0:22000:214:216:1:12320
+TV 5:10786:v:0:21997:164:112:1:9001
+RTM - MAROC:10786:v:0:21997:162:96:1:9002
+ESC1 - EGYPTE:10786:v:0:21997:163:104:1:9003
+RAI 1:10786:v:0:21997:289:290:1:9004
+RTPI:10786:v:0:21997:300:301:1:9006
+TV7:10786:v:0:21997:166:128:1:9007
+ARTE:10786:v:0:21997:167:136:1:9009
+Colourbars:12611:v:0:22000:48:49:1:3982
+Alice:12611:v:0:22000:162:96:1:12200
+Video Italia:12611:v:0:22000:121:122:1:12220
+ANDALUCIA TV:11934:v:0:27500:166:104:1:29011
+TVC INT.:12441:v:0:27500:512:660:1:29701
+TV4:11992:h:0:27500:165:98:1:20365
+TV Niepokalanow:11876:h:0:27500:161:82:1:20601
+VIVA:12670:v:0:22000:309:310:1:12732
+VIVA ZWEI:12552:v:0:22000:171:172:1:12120
+MTV Central:12699:v:0:22000:3031:3032:1:28643
+ONYX:12692:h:1:27500:161:84:1:502
+VIVA polska:11603:h:1:27500:190:191:1:611
+DeeJay TV:11603:h:1:27500:160:161:1:602
+NBC:11053:h:1:27500:550:551:1:8008
+EWTN:10722:h:1:29900:1001:1201:1:4601
+MTA INTL:10722:h:1:29900:1004:1204:1:4604
+VOX:11053:h:1:27500:500:501:1:8002
+SAT.1 A:11053:h:1:27500:511:512:1:8003
+RTL2 AUSTRIA:11053:h:1:27500:520:521:1:8004
+ZDF:11053:h:1:27500:570:571:1:8011
+K-TV:11053:h:1:27500:580:581:1:8012
+RTL Television:11053:h:1:27500:160:80:1:8001
+ARTE:11059:v:1:6510:98:99:1:1
+HOT Italia:11095:h:1:27500:4194:4195:1:3714
+Olisat:11095:h:1:27500:33:34:1:3718
+VIVA-POLSKA:11128:h:1:4340:98:99:1:1
+DW-tv:11195:v:1:9099:101:102:1:5301
+Canal 24 Horas:11203:h:1:3999:4130:4131:1:5301
+TV5:11337:v:1:5631:512:640:1:1
+SAT.1 CH:11603:h:1:27500:101:102:1:601
+KurdSat:11603:h:1:27500:111:112:1:603
+ARD "Das Erste":11603:h:1:27500:172:173:1:606
+RTL 2 CH:11603:h:1:27500:175:176:1:609
+Super RTL A:11603:h:1:27500:180:181:1:610
+TV ROMANIA:11622:v:1:27500:227:247:1:10707
+MRTV:11622:v:1:27500:222:242:1:10702
+102.5 HIT Ch:11622:v:1:27500:224:244:1:10704
+TLC SAT:11622:v:1:27500:225:245:1:10705
+PRO-SAT:11622:v:1:27500:246:226:1:10706
+Channel SUN:11622:v:1:27500:229:249:1:10709
+Racing Channel:11622:v:1:27500:228:248:1:10708
+3 ABN:11622:v:1:27500:221:241:1:10701
+Bloom.Germany:11642:h:1:27500:1460:1420:1:4
+Bloomberg TV UK:11642:h:1:27500:1560:1520:1:4
+Sat 7:11642:h:1:27500:1660:1620:1:4
+EDTV 1:11746:h:1:27500:4130:4131:1:9501
+EDTV SPORT:11746:h:1:27500:4386:4387:1:9502
+EDTV BUSINESS:11746:h:1:27500:4642:4643:1:9503
+EDTV DRAMA:11746:h:1:27500:4898:4899:1:9504
+RAI1:11765:v:1:27499:160:80:1:3401
+RAI2:11765:v:1:27499:161:84:1:3402
+RAI3:11765:v:1:27499:162:88:1:3403
+RaiWayTEST2:11765:v:1:27499:516:654:1:3405
+RAIMOSAICO:11765:v:1:27499:518:8191:1:3407
+RAINews24:11803:v:1:27500:516:654:1:3301
+CAMERA DEPUTATI:11803:v:1:27500:517:655:1:3302
+TELEPACE:11803:v:1:27500:515:653:1:3304
+RAISPORTSAT:11803:v:1:27500:512:650:1:3305
+RAINettunoSAT2:11803:v:1:27500:513:651:1:3306
+RAIeducational:11803:v:1:27500:514:652:1:3307
+RAINettunoSAT1:11803:v:1:27500:519:657:1:3308
+SAT2000:11803:v:1:27500:518:656:1:3309
+I1:11918:v:1:27499:512:650:1:1
+C5:11918:v:1:27499:513:660:1:2
+R4:11918:v:1:27499:514:670:1:3
+Telesierra:12091:h:1:27500:4160:4161:1:8704
+C. Milagro:12091:h:1:27500:4368:4369:1:8711
+Italia Sat:12091:h:1:27500:4600:4601:1:8728
+TVE Internacional:12091:h:1:27500:4208:4209:1:8707
+Fiesta:12091:h:1:27500:4432:4433:1:8720
+Retelsat:12091:h:1:27500:4464:4465:1:8722
+ART EUROPE:12013:h:1:27495:164:96:1:450
+EGYPT SAT. CH. 2:12013:h:1:27495:166:104:1:470
+IQRA:12013:h:1:27495:168:112:1:474
+MAURITANIA TV:12110:v:1:27500:230:231:1:704
+ARMENIA TV:12110:v:1:27500:240:241:1:705
+SAILING CHANNEL:12110:v:1:27500:260:261:1:707
+AL JAZEERA:12110:v:1:27500:270:271:1:708
+Coming Soon TV:12110:v:1:27500:310:311:1:717
+SaluteBenessere:12110:v:1:27500:320:321:1:718
+AH-EDP1:12148:v:1:27499:96:97:1:7201
+AH-EDP2:12148:v:1:27499:112:113:1:7202
+Espresso:12148:v:1:27499:192:193:1:7203
+Alice:12148:v:1:27499:160:161:1:7220
+Nuvolari:12148:v:1:27499:176:177:1:7221
+Leonardo:12148:v:1:27499:128:129:1:7222
+AH-EDP3:12148:v:1:27499:36:37:1:7205
+OTE Promo:12187:v:1:27500:517:655:1:1001
+RTS SAT:12187:v:1:27500:519:657:1:1022
+ERT SAT:12187:v:1:27500:514:652:1:1102
+EXTRA:12187:v:1:27500:516:654:1:1106
+TRIAL:12187:v:1:27500:513:651:1:1108
+Minimax:11303:h:1:19540:300:301:1:3
+TVN1:12209:h:1:5631:4194:4195:1:1
+RR TEST:10978:v:1:8998:33:34:1:1
+TV 5 Thailand:10978:v:1:8998:1057:1058:1:2
+TEST-1:10978:v:1:8998:3105:3106:1:4
+FASHION:12244:h:1:27500:123:133:1:103
+AJARA TV:12244:h:1:27500:127:137:1:107
+SLO-TV1:12300:v:1:27495:200:201:1:3201
+POLONIA 1:12302:v:1:27500:205:206:1:3203
+SUPER 1:12302:v:1:27500:207:208:1:3207
+NAPOLI INT.:12302:v:1:27500:240:241:1:3210
+MAGIC:12302:v:1:27500:245:246:1:3211
+COUNTDOWN:12302:v:1:27500:235:236:1:3212
+TBNE:12302:v:1:27500:230:231:1:3213
+NAPOLI CHANNEL:12302:v:1:27500:227:228:1:3215
+KURDISTAN TV:12302:v:1:27500:225:226:1:3214
+ATLAS TV:12379:v:1:27500:3022:3032:1:3002
+TELE 24 SWITZERLAND:12379:v:1:27500:3023:3033:1:3003
+Abu Dhabi TV:12379:v:1:27500:3024:3034:1:3004
+RTV MONTENEGRO:12379:v:1:27500:3026:3036:1:3006
+JAAM-E-JAM 1:12436:h:1:27500:160:80:1:1
+JAAM-E-JAM 2:12436:h:1:27500:161:82:1:2
+SAHAR:12436:h:1:27500:162:84:1:3
+SAHAR 2:12436:h:1:27500:163:86:1:4
+IRINN:12436:h:1:27500:164:88:1:5
+Musicmax:11303:h:1:19540:500:501:1:6
+TEST:12474:h:1:27500:771:8191:1:10608
+EbS:12474:h:1:27500:101:201:1:10601
+MOU.2:12474:h:1:27500:42:43:1:10602
+PINK PLUS:12474:h:1:27500:308:256:1:10605
+LibertyTV.com:12474:h:1:27500:941:942:1:10603
+2M Maroc:12474:h:1:27500:601:602:1:10607
+ZEE TV:12474:h:1:27500:910:911:1:10604
+WorldNet Europe:12483:v:1:8299:4260:4220:1:1
+WorldNet:12483:v:1:8299:4560:4520:1:4
+SICILIA INTERNATIONA:12519:v:1:27499:501:502:1:8309
+SARDEGNA UNO:12519:v:1:27499:503:504:1:8310
+EuroMed:12519:v:1:27499:510:511:1:8312
+TGRT:12519:v:1:27499:505:506:1:8313
+VIDEOLINA:12519:v:1:27499:515:516:1:8318
+MEDIOLANUM:12538:h:1:27500:1131:1132:1:8987
+www.travel:12538:h:1:27500:1180:1183:1:8992
+MonteCarloSat:12538:h:1:27500:5126:5122:1:8877
+Bulgaria TV:12538:h:1:27500:4612:4613:1:8827
+TVN1:12571:h:1:5631:4194:4195:1:1
+JSTV 1:12595:v:1:27500:2000:2001:1:8213
+JSTV 2:12595:v:1:27500:2011:2013:1:8214
+MBC:12595:v:1:27500:160:80:1:8201
+ANN:12595:v:1:27500:161:84:1:8202
+BET:12595:v:1:27500:167:108:1:8208
+EuroNews:12595:v:1:27500:2221:2231:1:8211
+Sharjah Arabs:12653:h:1:27500:1160:1120:1:1
+Qatar Arabs:12653:h:1:27500:1260:1220:1:2
+Saudi 1 Arabs:12653:h:1:27500:1360:1320:1:3
+Kuwait Arabs:12653:h:1:27500:1460:1420:1:4
+Libya Arabs:12653:h:1:27500:1560:1520:1:5
+Sudan Arabs:12653:h:1:27500:1660:1620:1:6
+Oman Arabs:12653:h:1:27500:1760:1720:1:7
+Jordan Arabs:12653:h:1:27500:1860:1820:1:8
+IRAQ TV:12653:h:1:27500:1960:1920:1:9
+Dubai Sport:12653:h:1:27500:1060:1020:1:10
+Digitaly:12672:v:1:27500:220:221:1:4203
+Telemarket:12672:v:1:27500:350:351:1:4211
+eVision:12672:v:1:27500:360:361:1:4214
+Thai TV5:12672:v:1:27500:200:201:1:4201
+Studio Europa:12672:v:1:27500:230:231:1:4204
+Video Italia:12672:v:1:27500:340:341:1:4210
+GAME NETWORK:12672:v:1:27500:291:292:1:4213
diff --git a/channels-conf/dvb-t/au-Sydney-NorthShore b/channels.conf-dvbt-australia
index 60e599d5..9709b0b5 100644
--- a/channels-conf/dvb-t/au-Sydney-NorthShore
+++ b/channels.conf-dvbt-australia
@@ -1,31 +1,31 @@
-ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:544
-ABC TV Sydney:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:545
-ABC TV 2:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:546
-ABC TV 3:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:547
-ABC TV 4 :226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:548
-ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2310:550
-Test.:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:0:549
-7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:514:1312
-7 Digital 1:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:514:1313
-7 Digital 2:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:514:1314
-7 Digital 3:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:513:514:1315
-7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:577:578:1316
-Program Guide:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:609:610:1318
-NINE DIGITAL:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:519:720:1
-NINE HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:5
-NINE GUIDE:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:517:720:6
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1569
-TEN Digital 1:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1570
-TEN Digital 2:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1571
-TEN Digital 3:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1572
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1573
-TEN Digital 4:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1574
-TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1575
-TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1576
-Ten Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1577
-SBS HD:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:768
-SBS DIGITAL 1:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:769
-SBS DIGITAL 2:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:770
-SBS EPG:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:772
-SBS RADIO 1:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:782
-SBS RADIO 2:571500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:783
+ABC HDTV:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:2307:0:560
+ABC TV Melbourne:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:561
+ABC TV 2:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:562
+ABC TV 3:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:563
+ABC TV 4:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:564
+ABC DiG Radio:226500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_3_4:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:0:2311:566
+TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1585
+TEN Digital 1:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1586
+TEN Digital 2:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1587
+TEN Digital 3:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1588
+TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1589
+TEN Digital 4:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1590
+TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1591
+TEN HD:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:0:1592
+TEN Digital:219500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:650:1593
+Nine Digital:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:513:660:1072
+Nine Digital HD:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:512:0:1073
+Nine Guide:191625000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_16:HIERARCHY_NONE:514:670:1074
+7 Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1328
+7 Digital 1:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1329
+7 Digital 2:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1330
+7 Digital 3:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:769:770:1331
+7 HD Digital:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:833:834:1332
+7 Program Guide:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:865:866:1334
+SBS HD:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:102:103:784
+SBS DIGITAL 1:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:81:785
+SBS DIGITAL 2:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:162:83:786
+SBS EPG:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:163:85:787
+SBS RADIO 1:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:201:798
+SBS RADIO 2:536500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:202:799
+
diff --git a/channels.conf-dvbt-berlin b/channels.conf-dvbt-berlin
new file mode 100644
index 00000000..dbddca52
--- /dev/null
+++ b/channels.conf-dvbt-berlin
@@ -0,0 +1,51 @@
+c5:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c7:191500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c25:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c27:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c33:570000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c44:658000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c56:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+c59:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:82
+
+SWR BW:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:257:258:16
+WDR:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:241:242:15
+BBC World:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:49:50:16387
+FAB:177500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_3_4:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:3073:3074:16576
+
+MDR Fernsehen:191500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:101:102:1
+arte:191500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:201:202:2
+NDR Fernsehen:191500000:INVERSION_OFF:BANDWIDTH_7_MHZ:FEC_2_3:FEC_NONE:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:301:302:3
+
+RTL:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:337:338:16405
+RTL2:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:353:354:16406
+Super RTL:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:433:434:16411
+VOX:506000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:16418
+
+Das Erste:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1401:1402:14
+Phoenix:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1301:1302:13
+RBB Berlin:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1201:1202:12
+RBB Brandenburg:522000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:1101:1102:11
+
+ZDF:570000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:545:546:514
+Info/3sat:570000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:561:562:515
+Doku/KiKa:570000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:593:594:517
+
+Kabel 1:658000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:161:162:16394
+N24:658000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:225:226:16398
+ProSieben:658000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:305:306:16403
+SAT.1:658000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:385:386:16408
+
+DSF:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:129:130:16392
+Testkanal n-tv:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:273:274:16401
+VIVA Plus:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:529:530:16417
+Eurosport:754000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:577:578:16420
+
+Testkanal Eurosport:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:577:578:16420
+SUD:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16642
+HUMAX DOWNLOAD SVC:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16645
+IP Services:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16640
+Media Broadcast Services:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16641
+SUD 1:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16643
+Kathrein Download:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:0:0:16644
+Testkanal MTV:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:193:194:16396
+Testkanal n-tv:778000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_8:HIERARCHY_NONE:273:274:16401
diff --git a/channels-conf/dvb-t/es-Collserola b/channels.conf-dvbt-collserola
index 9a1ec859..63456b2e 100644
--- a/channels-conf/dvb-t/es-Collserola
+++ b/channels.conf-dvbt-collserola
@@ -1,11 +1,11 @@
#channels.conf for DVB-T - Collserola (Barcelona) Transmitter
#C43
-TV3:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:112:801
-K3/33:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:121:122:802
-3/24:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:131:132:803
-Canal Pilot:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:141:142:804
-3XL.net:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:151:152:805
+TV3:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:111:112:801
+K3/33:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:121:122:802
+3/24:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:131:132:803
+Canal Pilot:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:141:142:804
+3XL.net:650000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_2_3:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:151:152:805
#C61
TVE 1:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
@@ -17,3 +17,9 @@ TELECINCO:794000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSM
#C66
Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
+Video Promocional 1:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:210:212:425
+Video Promocional 2:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:110:0:420
+[1388]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5000
+[138c]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5004
+[138a]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5002
+
diff --git a/channels-conf/dvb-t/uk-Crystal-Palace b/channels.conf-dvbt-crystal-palace
index a8518677..28fa0181 100644
--- a/channels-conf/dvb-t/uk-Crystal-Palace
+++ b/channels.conf-dvbt-crystal-palace
@@ -65,3 +65,6 @@ jazz fm:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMIS
Kerrang:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1301
Smash Hits:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1201
Kiss:537833333:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_3_4:FEC_NONE:QAM_16:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:0:1101
+
+
+
diff --git a/channels-conf/dvb-t/uk-Hannington b/channels.conf-dvbt-hannington
index b83620ed..b83620ed 100644
--- a/channels-conf/dvb-t/uk-Hannington
+++ b/channels.conf-dvbt-hannington
diff --git a/channels.conf-dvbt-madrid b/channels.conf-dvbt-madrid
new file mode 100644
index 00000000..cdf515bf
--- /dev/null
+++ b/channels.conf-dvbt-madrid
@@ -0,0 +1,16 @@
+Veo TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:302:1536
+Net TV:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:402:1825
+[1388]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5000
+[138c]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5004
+[138a]:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:5002
+Video Promocional:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:420
+Informe Semanal:834000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:0:0:425
+TVE 2:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:201:203:1441
+ANTENA 3:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:301:303:1121
+TELECINCO:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:401:403:1185
+CANAL+:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:501:503:1057
+TVE 1:770000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:101:103:1377
+Telemadrid:810000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:111:113:421
+La Otra:810000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:211:212:422
+Quiero Madrid:810000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:411:412:424
+Onda 6:810000000:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_1_2:QAM_64:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:311:312:423
diff --git a/channels-conf/dvb-t/uk-Oxford b/channels.conf-dvbt-oxford
index 29a53a26..29a53a26 100644
--- a/channels-conf/dvb-t/uk-Oxford
+++ b/channels.conf-dvbt-oxford
diff --git a/channels-conf/dvb-t/uk-Reigate b/channels.conf-dvbt-reigate
index f5fe7cca..f5fe7cca 100644
--- a/channels-conf/dvb-t/uk-Reigate
+++ b/channels.conf-dvbt-reigate
diff --git a/channels-conf/dvb-t/uk-Sandy-Heath b/channels.conf-dvbt-sandy_heath
index 99dc7468..a0cc632a 100644
--- a/channels-conf/dvb-t/uk-Sandy-Heath
+++ b/channels.conf-dvbt-sandy_heath
@@ -10,3 +10,4 @@ C4:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_
E4:665833334:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:2831:2832
C5:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6017:6018
Shop:650166666:INVERSION_OFF:BANDWIDTH_8_MHZ:FEC_2_3:FEC_NONE:QAM_64:TRANSMISSION_MODE_2K:GUARD_INTERVAL_1_32:HIERARCHY_NONE:6049:6050
+
diff --git a/dvb-c/at-Innsbruck b/dvb-c/at-Innsbruck
deleted file mode 100644
index ab920a3e..00000000
--- a/dvb-c/at-Innsbruck
+++ /dev/null
@@ -1,8 +0,0 @@
-# scan config for Innsbruck Telesystem cable provider
-# freq sr fec mod
-C 450000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 442000000 6875000 NONE QAM64
-C 546000000 6875000 NONE QAM64
-C 554000000 6875000 NONE QAM64
-C 562000000 6875000 NONE QAM64
diff --git a/dvb-c/at-Kabel-Braunau b/dvb-c/at-Kabel-Braunau
deleted file mode 100644
index 1d935676..00000000
--- a/dvb-c/at-Kabel-Braunau
+++ /dev/null
@@ -1,26 +0,0 @@
-# Kabel Braunau
-# freq sr fec mod
-C 386000000 6900000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 410000000 6875000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 458000000 6875000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6111000 NONE QAM64
-C 490000000 6111000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 506000000 6111000 NONE QAM64
-C 514000000 6111000 NONE QAM64
-C 522000000 6428000 NONE QAM128
-C 530000000 6428000 NONE QAM128
-C 546000000 6875000 NONE QAM64
-C 554000000 6875000 NONE QAM64
-C 562000000 6875000 NONE QAM64
-C 570000000 6111000 NONE QAM64
-C 578000000 6900000 NONE QAM256
-C 586000000 6900000 NONE QAM256
-C 594000000 6875000 NONE QAM64
diff --git a/dvb-c/at-Kabelsignal b/dvb-c/at-Kabelsignal
deleted file mode 100644
index 4f7ec113..00000000
--- a/dvb-c/at-Kabelsignal
+++ /dev/null
@@ -1,38 +0,0 @@
-# kabelsignal
-# freq sr fec mod
-C 314000000 6900000 NONE QAM256
-C 322000000 6900000 NONE QAM256
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 426000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-C 682000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM256
-C 738000000 6900000 NONE QAM256
-C 746000000 6900000 NONE QAM256
-C 762000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 802000000 6900000 NONE QAM256
-C 810000000 6900000 NONE QAM256
diff --git a/dvb-c/at-KarrerNet b/dvb-c/at-KarrerNet
deleted file mode 100644
index a00c6a25..00000000
--- a/dvb-c/at-KarrerNet
+++ /dev/null
@@ -1,26 +0,0 @@
-# Kabel St. Florian bei Linz/AT KarrerNet
-# 2009-01-10
-# freq sr fec mod
-C 442000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 490000000 6900000 NONE QAM64
-C 498000000 6900000 NONE QAM64
-C 506000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 530000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM64
-C 546000000 6900000 NONE QAM64
-C 554000000 6900000 NONE QAM64
-C 562000000 6900000 NONE QAM64
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
diff --git a/dvb-c/at-Liwest b/dvb-c/at-Liwest
deleted file mode 100644
index ad44f93f..00000000
--- a/dvb-c/at-Liwest
+++ /dev/null
@@ -1,31 +0,0 @@
-# Kabel Linz/AT Liwest
-# 2006-08-01
-# freq sr fec mod
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6875000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 506000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 530000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM64
-C 546000000 6900000 NONE QAM64
-C 554000000 6900000 NONE QAM64
-C 562000000 6900000 NONE QAM64
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 594000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 674000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM256
-C 634000000 6900000 NONE QAM256
-C 642000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
diff --git a/dvb-c/at-SalzburgAG b/dvb-c/at-SalzburgAG
deleted file mode 100644
index 9a032427..00000000
--- a/dvb-c/at-SalzburgAG
+++ /dev/null
@@ -1,8 +0,0 @@
-# scan config for Salzburg AG cable provider
-# freq sr fec mod
-C 306000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
diff --git a/dvb-c/at-Vienna b/dvb-c/at-Vienna
deleted file mode 100644
index 2c3d29cc..00000000
--- a/dvb-c/at-Vienna
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kabel Vienna
-# freq sr fec mod
-C 377750000 6900000 NONE QAM256
diff --git a/dvb-c/be-IN.DI-Integan b/dvb-c/be-IN.DI-Integan
deleted file mode 100644
index ca46717d..00000000
--- a/dvb-c/be-IN.DI-Integan
+++ /dev/null
@@ -1,16 +0,0 @@
-# Integan DVB-C (Belgium, IN.DI region)
-# freq sr fec mod
-C 330000000 6875000 NONE QAM256
-C 338000000 6875000 NONE QAM256
-C 346000000 6875000 NONE QAM256
-C 354000000 6875000 NONE QAM256
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM256
-C 378000000 6875000 NONE QAM256
-C 386000000 6875000 NONE QAM256
-C 394000000 6875000 NONE QAM256
-C 458000000 6875000 NONE QAM256
-C 466000000 6875000 NONE QAM256
-C 474000000 6875000 NONE QAM256
-C 482000000 6875000 NONE QAM256
-C 586000000 6875000 NONE QAM256
diff --git a/dvb-c/br-Net-Digital b/dvb-c/br-Net-Digital
deleted file mode 100644
index 8900124d..00000000
--- a/dvb-c/br-Net-Digital
+++ /dev/null
@@ -1,6 +0,0 @@
-# Net Digital
-# Just the initial transponder is enough
-
-# freq sr fec mod
-# Found on Sao Jose dos Campos, SP
-C 573000000 5217000 NONE QAM256
diff --git a/dvb-c/ch-Rega-Sense b/dvb-c/ch-Rega-Sense
deleted file mode 100644
index b072e510..00000000
--- a/dvb-c/ch-Rega-Sense
+++ /dev/null
@@ -1,34 +0,0 @@
-# Rega Sense, Switzerland
-# freq sr fec mod
-
-# Pay TV
-C 434000000 6900000 NONE QAM64 # Teleclub
-C 714000000 6900000 NONE QAM64
-C 722000000 6900000 NONE QAM64
-
-# Basis offer
-C 125000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 474000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 514000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM64
-C 586000000 6900000 NONE QAM64
-C 634000000 6900000 NONE QAM64
-C 642000000 6900000 NONE QAM64
-C 650000000 6900000 NONE QAM64
-C 658000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 730000000 6900000 NONE QAM64
-
-C 618000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-
-# HDTV
-C 642000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
diff --git a/dvb-c/ch-Video2000 b/dvb-c/ch-Video2000
deleted file mode 100644
index e3e47e5d..00000000
--- a/dvb-c/ch-Video2000
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cable Video2000
-# Canton of Neuchatel, Switzerland
-
-# freq sr fec mod
-C 306000000 6900000 NONE QAM64
diff --git a/dvb-c/ch-Zuerich-cablecom b/dvb-c/ch-Zuerich-cablecom
deleted file mode 100644
index 41c21609..00000000
--- a/dvb-c/ch-Zuerich-cablecom
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kabel cablecom.ch Zuerich
-# freq sr fec mod
-C 410000000 6900000 NONE QAM64
diff --git a/dvb-c/cz-Moravianet b/dvb-c/cz-Moravianet
deleted file mode 100644
index 39b379af..00000000
--- a/dvb-c/cz-Moravianet
+++ /dev/null
@@ -1,24 +0,0 @@
-# DVB-C Moravianet (http://www.moravia.net/)
-# Available in villages and cities around Brno:
-# Bohuslavice, Bukovany, Hrusovany u Brna, Hustopece, Ivancice, Jirikovice,
-# Kyjov, Moravsky Krumlov, Mutenice, Neslovice, Nove Branice, Oslavany,
-# Popuvky, Padochov, Troubsko, Rosice, Tisnov, Vojkovice, Svatoborice,
-# Slapanice, Zabcice, Zidlochovice
-# The same content is available also from NejTV where they provide DVB-C.
-# Currently it is in Havlickuv Brod, Breclav, Velke Mezirici
-#
-# 2008-12-03
-#
-# freq sr fec mod
-C 218000000 6900000 NONE QAM64
-C 226000000 6900000 NONE QAM64
-C 234000000 6900000 NONE QAM64
-C 242000000 6900000 NONE QAM64
-C 250000000 6900000 NONE QAM64
-C 258000000 6900000 NONE QAM64
-C 266000000 6900000 NONE QAM64
-C 274000000 6900000 NONE QAM64
-C 282000000 6900000 NONE QAM64
-C 290000000 6900000 NONE QAM64
-C 298000000 6900000 NONE QAM64
-C 306000000 6900000 NONE QAM64
diff --git a/dvb-c/de-Berlin b/dvb-c/de-Berlin
index 550ba767..4a53b745 100644
--- a/dvb-c/de-Berlin
+++ b/dvb-c/de-Berlin
@@ -2,4 +2,3 @@
# freq sr fec mod
C 394000000 6900000 NONE QAM64
C 113000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
diff --git a/dvb-c/de-Brandenburg-Havel b/dvb-c/de-Brandenburg-Havel
deleted file mode 100644
index 088f113f..00000000
--- a/dvb-c/de-Brandenburg-Havel
+++ /dev/null
@@ -1,30 +0,0 @@
-# Brandenburg an der Havel
-# freq sr fec mod
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6875000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 490000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
-C 506000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 538000000 6900000 NONE QAM256
-C 546000000 6900000 NONE QAM256
-C 554000000 6900000 NONE QAM256
-C 562000000 6900000 NONE QAM256
-C 570000000 6900000 NONE QAM64
-C 578000000 6900000 NONE QAM256
-C 586000000 6900000 NONE QAM64
-C 594000000 6900000 NONE QAM64
-C 602000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 618000000 6900000 NONE QAM64
-C 626000000 6900000 NONE QAM64
diff --git a/dvb-c/de-Kabel_BW b/dvb-c/de-Kabel_BW
deleted file mode 100644
index 437579fd..00000000
--- a/dvb-c/de-Kabel_BW
+++ /dev/null
@@ -1,16 +0,0 @@
-# Kabel-BW, Stand 04/2007
-#
-# Nur eine Anfangsfrequenz ist noetig, um den Ball ins
-# Rollen zu bringen. Quasi als Einstiegspunkt fuer eine
-# umfassende Suche. Es besteht kein Grund, sich um all die
-# vielen anderen Frequenzen und deren aktuell verwendete
-# Parameter zu kuemmern und diese dann womoeglich auch
-# noch auf einem aktuellen Stand halten zu wollen. Bei der
-# schieren Anzahl der innerhalb des Ausbaugebiets durch
-# Kabel BW genutzten Frequenzen waere das nur zeitraubend
-# und fehleranfaellig... ;-)
-#
-# Dirk Ritter <dirk@GNUmatic.de>
-#
-# freq sr fec mod
-C 113000000 6900000 NONE QAM64
diff --git a/dvb-c/de-Muenchen b/dvb-c/de-Muenchen
deleted file mode 100644
index e7f5b3ad..00000000
--- a/dvb-c/de-Muenchen
+++ /dev/null
@@ -1,27 +0,0 @@
-# 2008-06-22
-# Area: Muenchen City
-# Cable Provider: Kabel & Medien Service - http://www.atcable.de
-# Cable Content: Cablevista GmbH - http://www.cablevista.de
-#
-# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 346000000 6900000 NONE QAM64
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 482000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM256
-C 458000000 6900000 NONE QAM256
-C 490000000 6900000 NONE QAM256
diff --git a/dvb-c/de-Primacom b/dvb-c/de-Primacom
deleted file mode 100644
index 1e99b4c2..00000000
--- a/dvb-c/de-Primacom
+++ /dev/null
@@ -1,28 +0,0 @@
-# Primacom
-# freq sr fec mod
-C 121000000 6900000 NONE QAM64
-C 129000000 6900000 NONE QAM256
-C 137000000 6900000 NONE QAM256
-C 145000000 6900000 NONE QAM256
-C 306000000 6900000 NONE QAM64
-C 314000000 6900000 NONE QAM64
-C 322000000 6900000 NONE QAM64
-C 330000000 6900000 NONE QAM64
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM64
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 610000000 6900000 NONE QAM64
-C 746000000 6900000 NONE QAM64
diff --git a/dvb-c/de-Unitymedia b/dvb-c/de-Unitymedia
deleted file mode 100644
index b01020dd..00000000
--- a/dvb-c/de-Unitymedia
+++ /dev/null
@@ -1,36 +0,0 @@
-# Unitymedia
-# Created from http://www.unitymedia.de/service/soforthilfe/frequenzen.html
-# and http://www.unitymedia.de/images/UnityDigitalTV_Lineup_01-07-2009.pdf
-# freq sr fec mod
-C 113000000 6900000 NONE QAM256
-C 121000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 418000000 6900000 NONE QAM256
-C 426000000 6900000 NONE QAM256
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 458000000 6900000 NONE QAM256
-C 466000000 6900000 NONE QAM256
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 538000000 6900000 NONE QAM256
-C 546000000 6900000 NONE QAM256
-C 554000000 6900000 NONE QAM256
-C 562000000 6900000 NONE QAM256
-C 570000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM256
-C 666000000 6900000 NONE QAM256
-C 674000000 6900000 NONE QAM256
-C 682000000 6900000 NONE QAM256
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
diff --git a/dvb-c/de-iesy b/dvb-c/de-iesy
index 6726bb77..a2899511 100644
--- a/dvb-c/de-iesy
+++ b/dvb-c/de-iesy
@@ -1,20 +1,3 @@
-# Unity Media (iesy Hessen, ish Nordrhein-Westfalen)
+# Kabel iesy
# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM64
-C 362000000 6900000 NONE QAM64
-C 370000000 6900000 NONE QAM64
-C 378000000 6900000 NONE QAM64
-C 386000000 6900000 NONE QAM64
-C 394000000 6900000 NONE QAM64
-C 402000000 6900000 NONE QAM256
C 410000000 6900000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM256
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 538000000 6900000 NONE QAM256
diff --git a/dvb-c/de-komro-Rosenheim b/dvb-c/de-komro-Rosenheim
deleted file mode 100644
index 624513ee..00000000
--- a/dvb-c/de-komro-Rosenheim
+++ /dev/null
@@ -1,30 +0,0 @@
-# komro (Rosenheim)
-# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 121000000 6900000 NONE QAM64
-C 338000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM64
-C 458000000 6900000 NONE QAM64
-C 466000000 6900000 NONE QAM64
-C 522000000 6900000 NONE QAM256
-C 530000000 6900000 NONE QAM256
-C 602000000 6900000 NONE QAM256
-C 610000000 6900000 NONE QAM256
-C 626000000 6900000 NONE QAM256
-C 642000000 6900000 NONE QAM256
-C 650000000 6900000 NONE QAM256
-C 658000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM256
-C 698000000 6900000 NONE QAM256
-C 706000000 6900000 NONE QAM256
-C 714000000 6900000 NONE QAM256
-C 722000000 6900000 NONE QAM256
-C 730000000 6900000 NONE QAM64
-C 738000000 6900000 NONE QAM64
-C 746000000 6900000 NONE QAM64
-C 754000000 6900000 NONE QAM64
-C 762000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM64
diff --git a/dvb-c/de-neftv b/dvb-c/de-neftv
deleted file mode 100644
index 4de6b42f..00000000
--- a/dvb-c/de-neftv
+++ /dev/null
@@ -1,34 +0,0 @@
-# Cable conf for NEFtv
-# (Nuernberg, Erlangen, Fuerth and Herzogenaurach (herzomedia))
-
-# freq sr fec mod
-C 113000000 6900000 NONE QAM64
-C 346000000 6875000 NONE QAM64
-C 354000000 6875000 NONE QAM64
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM64
-C 378000000 6875000 NONE QAM64
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 410000000 6900000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 426000000 6900000 NONE QAM64
-C 434000000 6900000 NONE QAM64
-C 442000000 6900000 NONE QAM256
-C 450000000 6900000 NONE QAM256
-C 458000000 6875000 NONE QAM64
-# The following channel is only available in Herzogenaurach
-C 466000000 6900000 NONE QAM64
-C 474000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 514000000 6875000 NONE QAM64
-C 522000000 6900000 NONE QAM64
-C 546000000 6875000 NONE QAM64
-C 618000000 6900000 NONE QAM64
-C 634000000 6900000 NONE QAM64
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM64
-C 802000000 6900000 NONE QAM64
-C 810000000 6900000 NONE QAM64
diff --git a/dvb-c/dk-Aarhus-Antenneforening b/dvb-c/dk-Aarhus-Antenneforening
deleted file mode 100644
index 2a2f464c..00000000
--- a/dvb-c/dk-Aarhus-Antenneforening
+++ /dev/null
@@ -1,2 +0,0 @@
-# freq sr fec mod
-C 346000000 6900000 NONE QAM64
diff --git a/dvb-c/dk-Copenhagen-AFDK b/dvb-c/dk-Copenhagen-AFDK
deleted file mode 100644
index 2baa66dc..00000000
--- a/dvb-c/dk-Copenhagen-AFDK
+++ /dev/null
@@ -1,11 +0,0 @@
-# AFDK, Copenhagen
-# http://www.afdk.tv/
-# freq sr fec mod
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 490000000 6875000 NONE QAM64
-C 602000000 6875000 NONE QAM64
-C 610000000 6875000 NONE QAM64
-C 618000000 6875000 NONE QAM64
-C 794000000 6875000 NONE QAM64
diff --git a/dvb-c/dk-Odense b/dvb-c/dk-Odense
deleted file mode 100644
index 06a00c29..00000000
--- a/dvb-c/dk-Odense
+++ /dev/null
@@ -1,10 +0,0 @@
-# Glentevejs Antennelaug (Denmark / Odense)
-# freq sr fec mod
-C 442000000 6900000 NONE QAM64
-C 434000000 6875000 NONE QAM256
-C 255000000 5000000 NONE QAM256
-C 506000000 6875000 NONE QAM256
-C 562000000 6875000 NONE QAM256
-C 610000000 6875000 NONE QAM256
-C 754000000 6875000 NONE QAM256
-C 770000000 6875000 NONE QAM256
diff --git a/dvb-c/es-Euskaltel b/dvb-c/es-Euskaltel
deleted file mode 100644
index 46603e4f..00000000
--- a/dvb-c/es-Euskaltel
+++ /dev/null
@@ -1,19 +0,0 @@
-# Scan config for Euskaltel (DVB-C)
-# Basque Country - Spain
-# file automatically generated by w_scan
-# (http://free.pages.at/wirbel4vdr/w_scan/index2.html)
-# freq sr fec mod
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 730000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 746000000 6875000 NONE QAM64
-C 754000000 6875000 NONE QAM64
-C 762000000 6875000 NONE QAM64
-C 770000000 6875000 NONE QAM64
-C 778000000 6875000 NONE QAM64
-C 786000000 6875000 NONE QAM64
-C 794000000 6875000 NONE QAM64
-C 802000000 6875000 NONE QAM64
-C 810000000 6875000 NONE QAM64
-C 818000000 6875000 NONE QAM64
diff --git a/dvb-c/fi-3ktv b/dvb-c/fi-3ktv
new file mode 100644
index 00000000..55ccfd67
--- /dev/null
+++ b/dvb-c/fi-3ktv
@@ -0,0 +1,3 @@
+# 3KTV
+# freq sr fec mod
+C 306000000 6875000 NONE QAM64
diff --git a/dvb-c/fi-HTV b/dvb-c/fi-HTV
deleted file mode 100644
index ac007240..00000000
--- a/dvb-c/fi-HTV
+++ /dev/null
@@ -1,4 +0,0 @@
-# HTV
-# freq sr fec mod
-C 283000000 5900000 NONE QAM128
-C 154000000 6900000 NONE QAM128
diff --git a/dvb-c/fi-Joensuu-Tikka b/dvb-c/fi-Joensuu-Tikka
deleted file mode 100644
index d74462f3..00000000
--- a/dvb-c/fi-Joensuu-Tikka
+++ /dev/null
@@ -1,13 +0,0 @@
-# DVB-C, Tikka Media, Joensuu, Finland
-# freq sr fec mod
-C 154000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 170000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 434000000 6900000 NONE QAM128
-C 458000000 6900000 NONE QAM128
-C 466000000 6900000 NONE QAM128
-C 474000000 6900000 NONE QAM128
diff --git a/dvb-c/fi-TTV b/dvb-c/fi-TTV
deleted file mode 100644
index 68cfbcd1..00000000
--- a/dvb-c/fi-TTV
+++ /dev/null
@@ -1,4 +0,0 @@
-# TTV
-# freq sr fec mod
-C 418000000 6900000 NONE QAM128
-C 346000000 6900000 NONE QAM128
diff --git a/dvb-c/fi-Turku b/dvb-c/fi-Turku
deleted file mode 100644
index d11c11f6..00000000
--- a/dvb-c/fi-Turku
+++ /dev/null
@@ -1,23 +0,0 @@
-# Turun Kaapelitelevisio Oy (Turku)
-# freq sr fec mod
-C 146000000 6900000 NONE QAM128
-C 154000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 234000000 6900000 NONE QAM256
-C 242000000 6900000 NONE QAM256
-C 250000000 6900000 NONE QAM256
-C 258000000 6900000 NONE QAM256
-C 266000000 6900000 NONE QAM256
-C 290000000 6900000 NONE QAM128
-C 298000000 6900000 NONE QAM128
-C 322000000 6900000 NONE QAM128
-C 330000000 6900000 NONE QAM128
-C 338000000 6900000 NONE QAM128
-C 362000000 6900000 NONE QAM128
-C 378000000 6900000 NONE QAM128
-C 386000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 442000000 6900000 NONE QAM128
diff --git a/dvb-c/fi-dna b/dvb-c/fi-dna
deleted file mode 100644
index 38a3afb2..00000000
--- a/dvb-c/fi-dna
+++ /dev/null
@@ -1,34 +0,0 @@
-# DNA network reference channels
-# updated 2011-04-08 Antti Palosaari <crope@iki.fi>
-# http://www.dna.fi/YKSITYISILLE/TV/KAAPELITV/Sivut/Taajuudet.aspx
-#
-# freq sr fec mod
-C 154000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM128
-C 162000000 6875000 NONE QAM256
-C 170000000 6875000 NONE QAM128
-C 226000000 6875000 NONE QAM128
-C 234000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM128
-C 242000000 6875000 NONE QAM256
-C 250000000 6875000 NONE QAM256
-C 258000000 6875000 NONE QAM256
-C 266000000 6875000 NONE QAM256
-C 274000000 6875000 NONE QAM256
-C 282000000 6875000 NONE QAM256
-C 290000000 6875000 NONE QAM256
-C 298000000 6875000 NONE QAM128
-C 298000000 6875000 NONE QAM256
-C 306000000 6875000 NONE QAM128
-C 314000000 6875000 NONE QAM128
-C 322000000 6875000 NONE QAM128
-C 330000000 6875000 NONE QAM128
-C 338000000 6875000 NONE QAM128
-C 346000000 6875000 NONE QAM128
-C 354000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM128
-C 362000000 6875000 NONE QAM256
-C 370000000 6875000 NONE QAM128
-C 378000000 6875000 NONE QAM128
-C 386000000 6875000 NONE QAM128
-C 394000000 6875000 NONE QAM128
diff --git a/dvb-c/fi-jkl b/dvb-c/fi-jkl
deleted file mode 100644
index ad9811b1..00000000
--- a/dvb-c/fi-jkl
+++ /dev/null
@@ -1,10 +0,0 @@
-# OnCable (Finland / Jyväskylä)
-# freq sr fec mod
-C 514000000 6900000 NONE QAM128
-C 426000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 418000000 6900000 NONE QAM128
-C 490000000 6900000 NONE QAM128
-C 498000000 6900000 NONE QAM128
-C 402000000 6900000 NONE QAM128
-C 410000000 6900000 NONE QAM128
diff --git a/dvb-c/fi-sonera b/dvb-c/fi-sonera
deleted file mode 100644
index 54f3fe9d..00000000
--- a/dvb-c/fi-sonera
+++ /dev/null
@@ -1,12 +0,0 @@
-# Sonera kaapeli-tv (Finland)
-# Maksuttomat kanavat ovat 162 ja 170 MHz:n muxeissa
-#
-# freq      sr      fec  mod
-C 154000000 6900000 NONE QAM128
-C 162000000 6900000 NONE QAM128
-C 170000000 6900000 NONE QAM128
-C 314000000 6900000 NONE QAM128
-C 322000000 6900000 NONE QAM128
-C 338000000 6900000 NONE QAM128
-C 346000000 6900000 NONE QAM128
-C 354000000 6900000 NONE QAM128
diff --git a/dvb-c/fr-noos-numericable b/dvb-c/fr-noos-numericable
deleted file mode 100644
index 61e4b1e5..00000000
--- a/dvb-c/fr-noos-numericable
+++ /dev/null
@@ -1,41 +0,0 @@
-# Cable en France
-# freq sr fec mod
-C 123000000 6875000 NONE QAM64
-C 131000000 6875000 NONE QAM64
-C 139000000 6875000 NONE QAM64
-C 147000000 6875000 NONE QAM64
-C 155000000 6875000 NONE QAM64
-C 163000000 6875000 NONE QAM64
-C 171000000 6875000 NONE QAM64
-C 179000000 6875000 NONE QAM64
-C 187000000 6875000 NONE QAM64
-C 195000000 6875000 NONE QAM64
-C 203000000 6875000 NONE QAM64
-C 211000000 6875000 NONE QAM64
-C 219000000 6875000 NONE QAM64
-C 227000000 6875000 NONE QAM64
-C 235000000 6875000 NONE QAM64
-C 243000000 6875000 NONE QAM64
-C 251000000 6875000 NONE QAM64
-C 259000000 6875000 NONE QAM64
-C 267000000 6875000 NONE QAM64
-C 275000000 6875000 NONE QAM64
-C 283000000 6875000 NONE QAM64
-C 291000000 6875000 NONE QAM64
-C 299000000 6875000 NONE QAM64
-C 315000000 6875000 NONE QAM64
-C 323000000 6875000 NONE QAM64
-C 339000000 6875000 NONE QAM64
-C 347000000 6875000 NONE QAM64
-C 706000000 6875000 NONE QAM64
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 730000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 746000000 6875000 NONE QAM64
-C 748000000 6875000 NONE QAM64
-C 754000000 6875000 NONE QAM64
-C 762000000 6875000 NONE QAM64
-C 834000000 6875000 NONE QAM64
-C 842000000 6875000 NONE QAM64
-C 850000000 6875000 NONE QAM64
diff --git a/dvb-c/hu-Digikabel b/dvb-c/hu-Digikabel
deleted file mode 100644
index 3442d526..00000000
--- a/dvb-c/hu-Digikabel
+++ /dev/null
@@ -1,25 +0,0 @@
-# Digikabel, Hungary
-# For the following cities:
-# Budapest, Dorog, Hatvan, Kiskunhalas, Debrecen, Szekesfehervar, Pecs,
-# Veszprem, Dunaujvaros, Miskolc, Gyongyos, Tatabanya, Varpalota, Nagykanizsa,
-# Salgotarjan, Batonyterenye, Szolnok, Szentistvan, Nyiregyhaza, Gyor,
-# Szazhalombatta, Bekescsaba, Bekes, Eger, Komlo, Oroszlany
-# In some of the cities not all the frequencies are available.
-# freq sr fec mod
-C 121000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 402000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 746000000 6900000 NONE QAM256
-C 754000000 6900000 NONE QAM256
-C 762000000 6900000 NONE QAM256
-C 770000000 6900000 NONE QAM256
-C 778000000 6900000 NONE QAM256
-C 786000000 6900000 NONE QAM256
-C 794000000 6900000 NONE QAM256
-C 850000000 6900000 NONE QAM256
diff --git a/dvb-c/lu-Ettelbruck-ACE b/dvb-c/lu-Ettelbruck-ACE
deleted file mode 100644
index a0222b52..00000000
--- a/dvb-c/lu-Ettelbruck-ACE
+++ /dev/null
@@ -1,20 +0,0 @@
-# Scan config for Antenne Collective Ettelbruck a.s.b.l.
-# (http://antenne-ettelbruck.lu)
-# Luxembourg - Ettelbruck
-# freq sr fec mod
-C 634000000 6900000 NONE QAM64
-C 642000000 6900000 NONE QAM64
-C 650000000 6900000 NONE QAM64
-C 666000000 6900000 NONE QAM64
-C 674000000 6900000 NONE QAM64
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 706000000 6900000 NONE QAM64
-C 714000000 6900000 NONE QAM64
-C 656000000 3450000 NONE QAM64
-C 660000000 3450000 NONE QAM64
-C 720000000 3450000 NONE QAM64
-C 732000000 3450000 NONE QAM64
-C 724000000 3450000 NONE QAM64
-C 728000000 3450000 NONE QAM64
diff --git a/dvb-c/nl-Delta b/dvb-c/nl-Delta
deleted file mode 100644
index ac6548f9..00000000
--- a/dvb-c/nl-Delta
+++ /dev/null
@@ -1,8 +0,0 @@
-# Initial Tuning file for nl-DELTA
-# This file only lists the main
-# frequency. You still need to do
-# a network scan to find other
-# transponders.
-#
-#
-C 402000000 6875000 NONE QAM64 # Main Frequency
diff --git a/dvb-c/nl-REKAM-CAIW_Gouda b/dvb-c/nl-REKAM-CAIW_Gouda
deleted file mode 100644
index 1f9d01c9..00000000
--- a/dvb-c/nl-REKAM-CAIW_Gouda
+++ /dev/null
@@ -1,4 +0,0 @@
-# REKAM / Caiway, Gouda, Netherlands
-# freq sr fec mod
-C 163000000 6875000 NONE QAM64
-C 770000000 6900000 NONE QAM64
diff --git a/dvb-c/nl-Ziggo b/dvb-c/nl-Ziggo
deleted file mode 100644
index 037cca18..00000000
--- a/dvb-c/nl-Ziggo
+++ /dev/null
@@ -1,14 +0,0 @@
-# Initial Tuning file for nl-Ziggo
-# This file only lists the main
-# frequencies. You still need to do
-# a network scan to find other
-# transponders.
-#
-# based on:
-# http://blob.ziggo.nl/dynamic/NL_HOME/PDF-UPLOAD/Gebruikers-Handleiding-DigitaleTV.pdf
-# Chapter 4
-#
-C 372000000 6875000 NONE QAM64 # Main Frequency Ziggo/Casema
-C 514000000 6875000 NONE QAM64 # Main Frequency Ziggo/Multikabel
-C 356000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Zuid
-C 369000000 6875000 NONE QAM64 # Main Frequency Ziggo/@Home Noord
diff --git a/dvb-c/nl-Ziggo-Zwolle b/dvb-c/nl-Ziggo-Zwolle
deleted file mode 100644
index e47b4acf..00000000
--- a/dvb-c/nl-Ziggo-Zwolle
+++ /dev/null
@@ -1,26 +0,0 @@
-C 313000000 6875000 NONE QAM64 # TS 1
-C 361000000 6875000 NONE QAM64 # TS 2
-C 353000000 6875000 NONE QAM64 # TS 3
-C 345000000 6875000 NONE QAM64 # TS 4
-C 818000000 6875000 NONE QAM64 # TS 5
-C 329000000 6875000 NONE QAM64 # TS 6
-C 810000000 6875000 NONE QAM64 # TS 7
-C 305000000 6875000 NONE QAM64 # TS 8
-C 762000000 6875000 NONE QAM64 # TS 9
-C 618000000 6875000 NONE QAM64 # TS 10
-C 610000000 6875000 NONE QAM64 # TS 11
-C 337000000 6875000 NONE QAM64 # TS 12
-C 321000000 6875000 NONE QAM64 # TS 13
-C 385000000 6875000 NONE QAM64 # TS 14
-C 393000000 6875000 NONE QAM64 # TS 15
-C 401000000 6875000 NONE QAM64 # TS 16
-C 369000000 6875000 NONE QAM64 # TS 18 (main TS)
-C 297000000 6875000 NONE QAM64 # TS 19
-C 377000000 6875000 NONE QAM64 # TS 22
-C 754000000 6875000 NONE QAM64 # TS 23
-C 642000000 6875000 NONE QAM64 # TS 24
-C 650000000 6875000 NONE QAM64 # TS 25
-C 794000000 6875000 NONE QAM64 # TS 26
-C 409000000 6875000 NONE QAM64 # TS 27
-C 425000000 6875000 NONE QAM64 # TS 206
-C 417000000 6875000 NONE QAM64 # TS 207
diff --git a/dvb-c/no-Oslo-CanalDigital b/dvb-c/no-Oslo-CanalDigital
deleted file mode 100644
index 96f454e9..00000000
--- a/dvb-c/no-Oslo-CanalDigital
+++ /dev/null
@@ -1,13 +0,0 @@
-# no-oslo-CanalDigital (cable)
-C 354000000 6950000 NONE QAM64
-C 362000000 6950000 NONE QAM64
-C 370000000 6950000 NONE QAM64
-C 378000000 6950000 NONE QAM64
-C 386000000 6950000 NONE QAM64
-C 394000000 6950000 NONE QAM64
-C 402000000 6950000 NONE QAM64
-C 410000000 6950000 NONE QAM64
-C 418000000 6950000 NONE QAM64
-C 426000000 6950000 NONE QAM64
-C 450000000 6950000 NONE QAM64
-C 474000000 6950000 NONE QAM64
diff --git a/dvb-c/no-Oslo-Get b/dvb-c/no-Oslo-Get
deleted file mode 100644
index 42e17bbb..00000000
--- a/dvb-c/no-Oslo-Get
+++ /dev/null
@@ -1,22 +0,0 @@
-# no-Oslo-Get (cable)
-C 241000000 6900000 NONE QAM256
-C 272000000 6900000 NONE QAM256
-C 280000000 6900000 NONE QAM256
-C 290000000 6900000 NONE QAM256
-C 298000000 6900000 NONE QAM256
-C 306000000 6900000 NONE QAM256
-C 314000000 6900000 NONE QAM256
-C 322000000 6900000 NONE QAM256
-C 330000000 6900000 NONE QAM256
-C 338000000 6900000 NONE QAM256
-C 346000000 6900000 NONE QAM256
-C 354000000 6900000 NONE QAM256
-C 362000000 6900000 NONE QAM256
-C 370000000 6900000 NONE QAM256
-C 378000000 6900000 NONE QAM256
-C 386000000 6900000 NONE QAM256
-C 394000000 6900000 NONE QAM256
-C 410000000 6900000 NONE QAM256
-C 442000000 6952000 NONE QAM256
-C 482000000 6900000 NONE QAM256
-C 498000000 6900000 NONE QAM256
diff --git a/dvb-c/se-Gothnet b/dvb-c/se-Gothnet
deleted file mode 100644
index 8b04ef76..00000000
--- a/dvb-c/se-Gothnet
+++ /dev/null
@@ -1,23 +0,0 @@
-# Gothnet DVB-C
-# Updated: 2008-09-19
-# freq sr fec mod
-
-# Free channels
-C 490000000 6875000 NONE QAM64
-C 498000000 6875000 NONE QAM64
-C 506000000 6875000 NONE QAM64
-C 514000000 6875000 NONE QAM64
-
-# SPA channels
-C 682000000 6900000 NONE QAM64
-C 690000000 6900000 NONE QAM64
-C 698000000 6900000 NONE QAM64
-C 706000000 6900000 NONE QAM64
-
-# Canal Digital channels
-C 314000000 7000000 NONE QAM64
-C 322000000 7000000 NONE QAM64
-C 346000000 7000000 NONE QAM64
-C 354000000 7000000 NONE QAM64
-C 362000000 7000000 NONE QAM64
-C 370000000 7000000 NONE QAM64
diff --git a/dvb-c/se-comhem b/dvb-c/se-comhem
deleted file mode 100644
index 7452c7f0..00000000
--- a/dvb-c/se-comhem
+++ /dev/null
@@ -1,25 +0,0 @@
-# com hem
-# freq sr fec mod
-C 289500000 6875000 NONE QAM64
-C 298000000 6875000 NONE QAM64
-C 306000000 6875000 NONE QAM64
-C 314000000 6875000 NONE QAM64
-C 322000000 6875000 NONE QAM64
-C 338000000 6875000 NONE QAM64
-C 346000000 6875000 NONE QAM64
-C 354000000 6875000 NONE QAM64
-C 362000000 6875000 NONE QAM64
-C 370000000 6875000 NONE QAM64
-C 378000000 6875000 NONE QAM64
-C 386000000 6875000 NONE QAM64
-C 394000000 6875000 NONE QAM64
-C 402000000 6875000 NONE QAM64
-C 418000000 6875000 NONE QAM64
-C 434000000 6875000 NONE QAM64
-C 442000000 6875000 NONE QAM64
-C 450000000 6875000 NONE QAM64
-C 458000000 6875000 NONE QAM64
-C 714000000 6875000 NONE QAM64
-C 722000000 6875000 NONE QAM64
-C 738000000 6875000 NONE QAM64
-C 786000000 6875000 NONE QAM64
diff --git a/dvb-h/README b/dvb-h/README
deleted file mode 100644
index 50e137d3..00000000
--- a/dvb-h/README
+++ /dev/null
@@ -1,3 +0,0 @@
-These files are mainly for informational and experimental purposes.
-The DVB-H file format hasn't been specified in any way; currently it's just
-a copy of the DVB-T format.
diff --git a/dvb-h/fi-Helsinki b/dvb-h/fi-Helsinki
deleted file mode 100644
index c593929f..00000000
--- a/dvb-h/fi-Helsinki
+++ /dev/null
@@ -1,2 +0,0 @@
-# H freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-H 586000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-h/fi-Oulu b/dvb-h/fi-Oulu
deleted file mode 100644
index 7a6be88b..00000000
--- a/dvb-h/fi-Oulu
+++ /dev/null
@@ -1,2 +0,0 @@
-# H freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-H 498000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-h/fi-Oulu-Nokia-devel b/dvb-h/fi-Oulu-Nokia-devel
deleted file mode 100644
index 62136070..00000000
--- a/dvb-h/fi-Oulu-Nokia-devel
+++ /dev/null
@@ -1,4 +0,0 @@
-# Nokia Oulu delelopment network
-# Network Name 'Nokia Oulu'
-# H freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-H 690000000 8MHz 1/2 NONE QPSK 8k 1/8 NONE
diff --git a/dvb-h/fi-Turku b/dvb-h/fi-Turku
deleted file mode 100644
index 7a6be88b..00000000
--- a/dvb-h/fi-Turku
+++ /dev/null
@@ -1,2 +0,0 @@
-# H freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-H 498000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-s/ABS1-75.0E b/dvb-s/ABS1-75.0E
deleted file mode 100644
index 26ea163e..00000000
--- a/dvb-s/ABS1-75.0E
+++ /dev/null
@@ -1,10 +0,0 @@
-# ABS-1 @ 75E
-# freq pol sr fec
-S 12518000 V 22000000 AUTO
-S 12548000 V 22000000 AUTO
-S 12579000 V 22000000 AUTO
-S 12640000 V 22000000 AUTO
-S 12670000 V 22000000 AUTO
-S 12693000 V 10000000 AUTO
-S 12704000 V 3900000 AUTO
-S 12740000 V 7408000 AUTO
diff --git a/dvb-s/AMC1-103w b/dvb-s/AMC1-103w
deleted file mode 100644
index f09dc622..00000000
--- a/dvb-s/AMC1-103w
+++ /dev/null
@@ -1,5 +0,0 @@
-# AMC 1 @ 103W
-# freq pol sr fec
-
-S 11942000 V 20000000 AUTO
-S 12100000 V 20000000 AUTO
diff --git a/dvb-s/AMC2-85w b/dvb-s/AMC2-85w
deleted file mode 100644
index 0cd06111..00000000
--- a/dvb-s/AMC2-85w
+++ /dev/null
@@ -1,6 +0,0 @@
-# AMC 2 @ 85W
-# freq pol sr fec
-
-S 11731000 H 13021000 AUTO
-S 11744000 H 13021000 AUTO
-S 11771000 H 13021000 AUTO
diff --git a/dvb-s/AMC3-87w b/dvb-s/AMC3-87w
deleted file mode 100644
index a081c573..00000000
--- a/dvb-s/AMC3-87w
+++ /dev/null
@@ -1,10 +0,0 @@
-# AMC 3 @ 87.0W
-# freq pol sr fec
-
-S 11716000 H 04859000 AUTO
-S 12142000 V 30000000 AUTO
-S 12147000 H 04340000 AUTO
-S 12159000 H 04444000 AUTO
-S 12165000 H 04444000 AUTO
-S 12172000 H 04444000 AUTO
-S 12182000 V 30000000 AUTO
diff --git a/dvb-s/AMC4-101w b/dvb-s/AMC4-101w
deleted file mode 100644
index dd732ddd..00000000
--- a/dvb-s/AMC4-101w
+++ /dev/null
@@ -1,10 +0,0 @@
-# AMC 4 @ 101.0W
-# freq pol sr fec
-
-S 11573000 V 07234000 AUTO
-S 11655000 V 30000000 AUTO
-S 11708000 V 02170000 AUTO
-S 11822000 H 05700000 AUTO
-S 11860000 H 28138000 AUTO
-S 12120000 V 30000000 AUTO
-S 12169000 H 03003000 AUTO
diff --git a/dvb-s/AMC5-79w b/dvb-s/AMC5-79w
deleted file mode 100644
index 0aeebc64..00000000
--- a/dvb-s/AMC5-79w
+++ /dev/null
@@ -1,5 +0,0 @@
-# AMC 5 @ 79W
-# freq pol sr fec
-
-S 11742000 V 11110000 AUTO
-S 12182000 H 23000000 AUTO
diff --git a/dvb-s/AMC6-72w b/dvb-s/AMC6-72w
deleted file mode 100644
index 75307da6..00000000
--- a/dvb-s/AMC6-72w
+++ /dev/null
@@ -1,44 +0,0 @@
-# AMC 6 @ 72W
-# freq pol sr fec
-
-S 11482000 V 02656000 AUTO
-S 11494000 V 06560000 AUTO
-S 11499000 V 02964000 AUTO
-S 11505000 V 02963000 AUTO
-S 11546000 V 12000000 AUTO
-S 11548000 H 03002000 AUTO
-S 11552000 H 03002000 AUTO
-S 11557000 H 04392000 AUTO
-S 11563000 H 04392000 AUTO
-S 11570000 H 04392000 AUTO
-S 11576000 H 04392000 AUTO
-S 11586000 H 02652000 AUTO
-S 11603000 V 08500000 AUTO
-S 11605000 V 03600000 AUTO
-S 11611000 V 03400000 AUTO
-S 11628000 V 06560000 AUTO
-S 11637000 V 02800000 AUTO
-S 11641000 V 03702000 AUTO
-S 11648000 V 07500000 AUTO
-S 11667000 V 07400000 AUTO
-S 11674000 V 04000000 AUTO
-S 11680000 V 03255000 AUTO
-S 11703000 V 03979000 AUTO
-S 11709000 V 03979000 AUTO
-S 11715000 V 03979000 AUTO
-S 11746000 V 03979000 AUTO
-S 11748000 H 14015000 AUTO
-S 11752000 V 03979000 AUTO
-S 11763000 V 03979000 AUTO
-S 11817000 H 05000000 AUTO
-S 11874000 V 04000000 AUTO
-S 11986000 V 03979000 AUTO
-S 11995000 V 03979000 AUTO
-S 12004000 V 03979000 AUTO
-S 12013000 V 03979000 AUTO
-S 12025000 V 03979000 AUTO
-S 12031000 V 03979000 AUTO
-S 12046000 H 06111000 AUTO
-S 12055000 V 06890000 AUTO
-S 12144000 V 02573000 AUTO
-S 12188000 H 06511000 AUTO
diff --git a/dvb-s/AMC9-83w b/dvb-s/AMC9-83w
deleted file mode 100644
index b7d08826..00000000
--- a/dvb-s/AMC9-83w
+++ /dev/null
@@ -1,18 +0,0 @@
-# AMC 9 @ 83W
-# freq pol sr fec
-
-S 11745000 H 04232000 AUTO
-S 11751000 H 04232000 AUTO
-S 11757000 H 04232000 AUTO
-S 11763000 H 04232000 AUTO
-S 11769000 H 04232000 AUTO
-S 11775000 H 04232000 AUTO
-S 11826000 H 05632000 AUTO
-S 11864000 H 03979000 AUTO
-S 11871000 H 13000000 AUTO
-S 11889000 H 13025000 AUTO
-S 11926000 V 06511000 AUTO
-S 11953000 V 03979000 AUTO
-S 11960000 H 05000000 AUTO
-S 12002000 H 03979000 AUTO
-S 12011000 H 03979000 AUTO
diff --git a/dvb-s/Agila2_C-146.0E b/dvb-s/Agila2_C-146.0E
deleted file mode 100644
index ac30747e..00000000
--- a/dvb-s/Agila2_C-146.0E
+++ /dev/null
@@ -1,60 +0,0 @@
-# Agila 2 @ 146.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Viva Prime Channel
-S 3725000 H 2345000 3/4
-
-# Zoe Philippines
-S 3774000 V 3300000 3/4
-
-# Da Ai TV indonesia
-S 3791000 H 3100000 3/4
-
-# Trinity Broadcasting Multiplex
-S 3791000 V 10091000 5/6
-
-# Bayon TV
-S 3796000 H 3360000 3/4
-
-# White Springs TV
-S 3846000 H 6110000 3/4
-
-# TCT World
-S 3854000 H 2603000 5/6
-
-# CCTN
-S 3873000 V 2532000 3/4
-
-# NBN Philippines
-S 3875000 H 3000000 3/4
-
-# Al Masriyah
-S 3880000 H 2000000 3/4
-
-# Viva Entertainment Multiplex
-S 3887000 H 6716000 3/4
-
-# IBC13
-S 3896000 H 3000000 3/4
-
-# CTN Cambodia Multiplex
-S 3979000 V 9628000 3/4
-
-# Divya TV
-S 3990000 V 13330000 3/4
-
-# Familyland TV Network
-S 4164000 V 3735000 7/8
-
-# MTV Philippines
-S 4171000 V 3213000 3/4
-
-# The Old Path TV
-S 4183000 V 2170000 3/4
-
-# UNTV
-S 4188000 V 2170000 3/4
diff --git a/dvb-s/Amazonas-61.0W b/dvb-s/Amazonas-61.0W
deleted file mode 100644
index 825b18af..00000000
--- a/dvb-s/Amazonas-61.0W
+++ /dev/null
@@ -1,54 +0,0 @@
-# Amazonas @ 61.0W
-# freq pol sr fec
-
-S 3957000 H 06666000 AUTO
-S 3966000 H 06666000 AUTO
-S 3975000 H 06666000 AUTO
-S 3993000 H 06666000 AUTO
-S 4137000 H 03409000 AUTO
-S 3941000 V 03480000 AUTO
-S 12092000 V 30000000 AUTO
-S 12132000 V 30000000 AUTO
-S 4174000 H 03330000 AUTO
-S 11128000 V 06666000 AUTO
-S 11185000 V 11800000 AUTO
-S 11049000 V 02000000 AUTO
-S 12052000 V 27000000 AUTO
-S 10975000 V 27000000 AUTO
-S 3631000 H 02785000 AUTO
-S 10975000 H 26666000 AUTO
-S 3677000 H 04400000 AUTO
-S 3985000 H 04444000 AUTO
-S 11810000 V 06666000 AUTO
-S 11921000 V 21740000 AUTO
-S 11943000 V 04750000 AUTO
-S 4168000 H 07307000 AUTO
-S 12052000 H 26667000 AUTO
-S 12172000 H 27500000 AUTO
-S 12092000 H 27500000 AUTO
-S 11175000 H 28880000 AUTO
-S 4154000 H 09615000 AUTO
-S 11099000 V 07576000 AUTO
-S 11885000 H 04890000 AUTO
-S 11882000 V 11343000 AUTO
-S 11133000 V 03111000 AUTO
-S 11078000 V 01862000 AUTO
-S 11912000 H 02222000 AUTO
-S 11906000 H 02220000 AUTO
-S 11108000 V 02170000 AUTO
-S 12132000 H 27500000 AUTO
-S 11135000 H 26667000 AUTO
-S 4144000 V 04540000 AUTO
-S 11808000 H 11111000 AUTO
-S 11972000 H 26667000 AUTO
-S 4156000 V 04540000 AUTO
-S 4149000 V 04540000 AUTO
-S 3948000 H 13300000 AUTO
-S 4178000 H 03333000 AUTO
-S 11844000 V 16600000 AUTO
-S 11095000 H 30000000 AUTO
-S 11790000 H 03600000 AUTO
-S 12172000 V 30000000 AUTO
-S 11015000 H 26666000 AUTO
-S 11055000 H 27500000 AUTO
-S 12012000 H 27500000 AUTO
diff --git a/dvb-s/Amos-4w b/dvb-s/Amos-4w
deleted file mode 100644
index d10c48a7..00000000
--- a/dvb-s/Amos-4w
+++ /dev/null
@@ -1,48 +0,0 @@
-# Amos 6 @ 4W
-# freq pol sr fec
-S 10722000 H 27500000 3/4
-S 10722000 V 27500000 3/4
-S 10722000 V 30000000 2/3
-S 10758000 V 27500000 3/4
-S 10758000 V 30000000 2/3
-S 10759000 H 30000000 3/4
-S 10806000 H 27500000 5/6
-S 10806000 V 27500000 3/4
-S 10842000 H 27500000 7/8
-S 10842000 V 27500000 3/4
-S 10842000 V 30000000 2/3
-S 10890000 H 27500000 7/8
-S 10890000 V 27500000 3/4
-S 10925000 H 27500000 7/8
-S 10925000 V 27500000 3/4
-S 10972000 V 27500000 3/4
-S 11008000 V 27500000 3/4
-S 11015000 H 2295000 3/4
-S 11123000 H 1850000 7/8
-S 11167000 H 12500000 5/6
-S 11179000 H 6666000 3/4
-S 11260000 H 27500000 3/4
-S 11304000 H 19540000 3/4
-S 11319000 H 2750000 3/4
-S 11329000 H 3333000 3/4
-S 11333000 H 3500000 3/4
-S 11347000 H 3350000 3/4
-S 11384000 H 19000000 5/6
-S 11411000 H 7925000 5/6
-S 11429000 H 5925000 3/4
-S 11435000 H 2089000 3/4
-S 11474000 V 27500000 3/4
-S 11510000 V 30000000 2/3
-S 11558000 V 27500000 3/4
-S 11559000 H 13400000 7/8
-S 11572000 H 8888000 3/4
-S 11592000 H 21350000 3/4
-S 11593000 V 27500000 3/4
-S 11625000 V 3000000 3/4
-S 11630000 H 2963000 3/4
-S 11630000 V 3000000 3/4
-S 11637000 V 1480000 3/4
-S 11647000 H 9167000 3/4
-S 11647000 V 8518000 3/4
-S 11654000 H 2000000 5/6
-S 11658000 V 8520000 5/6
diff --git a/dvb-s/Anik-F1-107.3W b/dvb-s/Anik-F1-107.3W
deleted file mode 100644
index 2cf82aae..00000000
--- a/dvb-s/Anik-F1-107.3W
+++ /dev/null
@@ -1,7 +0,0 @@
-# Anik F1 @ 107.3W
-# freq pol sr fec
-
-S 12002000 H 19980000 AUTO
-S 12063000 H 19980000 AUTO
-S 12155000 H 22500000 AUTO
-S 12185000 H 19980000 AUTO
diff --git a/dvb-s/Apstar6_C-134.0E b/dvb-s/Apstar6_C-134.0E
deleted file mode 100644
index 6a8a1f17..00000000
--- a/dvb-s/Apstar6_C-134.0E
+++ /dev/null
@@ -1,15 +0,0 @@
-# Apstar 6 @ 134.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# New Entertainment
-S 3766000 H 4285000 3/4
-
-# Test
-S 3840000 H 27500000 3/4
-
-# TV Nusantara
-S 3905000 H 3250000 3/4
diff --git a/dvb-s/AsiaSat2_C-100.5E b/dvb-s/AsiaSat2_C-100.5E
deleted file mode 100644
index 1cc80354..00000000
--- a/dvb-s/AsiaSat2_C-100.5E
+++ /dev/null
@@ -1,51 +0,0 @@
-# AsiaSat 2 100.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Iris Sat Multiplex
-S 3660000 V 27500000 3/4
-
-# APTN Direct
-S 3706000 H 4167000 5/6
-
-# APTN Global Video Wire (MPEG-4 S/2)
-S 3732000 H 8889000 2/3
-
-# BYU TV
-S 3767000 V 6527000 1/2
-
-# AJK TV
-S 3778000 V 3333000 3/4
-
-# RTB International Brunei
-S 3786000 H 6000000 7/8
-
-# Shamshad TV
-S 3790000 V 2444000 3/4
-
-# FTV HD (MPEG-4 S/2)
-S 3794000 H 4640000 3/4
-
-# Arabsat ASBU Bouquet Multiplex
-S 3820000 V 27500000 3/4
-
-# Star TV Multiplex (MPEG-4 S/2)
-S 3840000 H 30000000 3/4
-
-# E Network Multiplex
-S 3880000 H 27500000 3/4
-
-# SatLink Multiplex
-S 3960000 H 27500000 3/4
-
-# Star TV Multiplex
-S 3980000 V 28100000 3/4
-
-# SatLink European Bouquet (MPEG-2 & MPEG-4 S2)
-S 4000000 H 28125000 3/4
-
-# Macau Satellite TV Multiplex
-S 4148000 V 11852000 3/4
diff --git a/dvb-s/AsiaSat3S_C-105.5E b/dvb-s/AsiaSat3S_C-105.5E
deleted file mode 100644
index 4d09ef50..00000000
--- a/dvb-s/AsiaSat3S_C-105.5E
+++ /dev/null
@@ -1,102 +0,0 @@
-# AsiaSat 3S 105.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# China Entertainment TV & Maharishi Veda Vision
-S 3680000 H 26670000 3/4
-
-# MediaCorp Channel News Asia
-S 3706000 H 6000000 3/4
-
-# BTV World
-S 3725000 V 4450000 3/4
-
-# Galaxy TVB
-S 3729000 H 13650000 3/4
-
-# Zee Network
-S 3733000 V 6500000 3/4
-
-# Madani Channel
-S 3739000 V 2815000 3/4
-
-# Fashion TV
-S 3746000 V 2625000 3/4
-
-# Aaj News
-S 3750000 V 2821000 3/4
-
-# Arirang Arab
-S 3755000 V 4418000 7/8
-
-# Globecast multiplex
-S 3760000 H 26000000 7/8
-
-# Star TV Multiplex
-S 3780000 V 28100000 3/4
-
-# Airwaves Media Multiplex
-S 3786000 H 5700000 3/4
-
-# Zee Network Multiplex
-S 3820000 V 27500000 3/4
-
-# Star TV Multiplex
-S 3840000 H 26850000 7/8
-
-# Star TV Multiplex
-S 3860000 V 27500000 3/4
-
-# B4U INDIA - MPEG-4 S/2 Multiplex
-S 3880000 H 27500000 3/4
-
-# Star TV Multiplex
-S 3940000 V 28100000 3/4
-
-# Tuner International Multiplex
-S 3960000 H 28100000 3/4
-
-# Star TV Multiplex
-S 3980000 V 28100000 3/4
-
-# Star TV Multiplex
-S 4000000 H 26850000 7/8
-
-# Sahara Samay Multiplex
-S 4020000 V 27250000 3/4
-
-# VOA Voice Of America Multiplex
-S 4040000 H 20400000 1/2
-
-# Globecast Multiplex
-S 4071000 H 14240000 3/4
-
-# PTV Multiplex
-S 4091000 V 13333000 3/4
-
-# Sun TV
-S 4095000 H 5554000 3/4
-
-# PTV Global USA
-S 4102000 V 2894000 3/4
-
-# PTV Global UK & Europe
-S 4106000 V 2894000 3/4
-
-# Galaxy TVB Multiplex
-S 4111000 H 13650000 3/4
-
-# PTV Multiplex
-S 4114000 V 7000000 3/4
-
-# Eye TV Multiplex
-S 4129000 H 13600000 3/4
-
-# Zee Network Multiplex
-S 4140000 V 27500000 3/4
-
-# Geo TV Network Multiplex
-S 4180000 V 26666000 3/4
diff --git a/dvb-s/Asiasat4_C-122.2E b/dvb-s/Asiasat4_C-122.2E
deleted file mode 100644
index 60a97300..00000000
--- a/dvb-s/Asiasat4_C-122.2E
+++ /dev/null
@@ -1,27 +0,0 @@
-# Asiasat 4 @ 122.2E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# SITI Digital Network Multiplex
-S 3760000 H 27500000 3/4
-
-# SITI Digital Network Multiplex
-S 3820000 V 27500000 3/4
-
-# Henan Radio Multiplex
-S 3856000 H 2170000 3/4
-
-# SITI Digital Network Multiplex
-S 3880000 H 27500000 3/4
-
-# SITI Digital network Multiplex
-S 3920000 H 27500000 3/4
-
-# SITI Digital network Multiplex
-S 3960000 H 27500000 3/4
-
-# SITI Digital network Multiplex
-S 4180000 V 27500000 3/4
diff --git a/dvb-s/Astra-23.5E b/dvb-s/Astra-23.5E
deleted file mode 100644
index 6e45dbf9..00000000
--- a/dvb-s/Astra-23.5E
+++ /dev/null
@@ -1,66 +0,0 @@
-# Astra 23.5E
-# freq pol sr fec
-S 10758000 V 22000000 7/8
-S 10788000 V 22000000 5/6
-S 10802000 H 22000000 5/6
-S 10842000 V 13333000 5/6
-S 10862000 H 22000000 5/6
-# Astra2Connect
-# S2 10891250 H 22000000 3/4 AUTO 8PSK
-S 11475000 V 27500000 3/4
-S 11515000 H 27500000 3/4
-S2 11515000 V 28500000 9/10 AUTO QPSK
-S2 11555000 H 28500000 9/10 AUTO QPSK
-S2 11555000 V 28500000 9/10 AUTO QPSK
-S2 11592000 V 28500000 9/10 AUTO QPSK
-S2 11595000 H 28500000 9/10 AUTO QPSK
-S2 11635000 H 28500000 9/10 AUTO QPSK
-S2 11635000 V 28500000 9/10 AUTO QPSK
-S 11675000 H 27500000 3/4
-S2 11675000 V 28500000 9/10 AUTO QPSK
-S2 11719000 H 27500000 9/10 AUTO QPSK
-S 11739000 V 27500000 3/4
-# Astra2Connect
-# S2 11758000 H 27500000 5/6 AUTO 8PSK
-S2 11778000 V 27500000 9/10 AUTO QPSK
-S 11798000 H 27500000 3/4
-S2 11817000 V 27500000 9/10 AUTO QPSK
-S 11836000 H 29900000 3/4
-S2 11856000 V 27500000 5/6 AUTO QPSK
-S 11875000 H 27500000 3/4
-S 11914000 H 27500000 3/4
-# Astra2Connect
-# S2 11954000 H 27500000 3/4 AUTO 8PSK
-S 11992000 H 27500000 3/4
-S 12012000 V 27500000 3/4
-S2 12032000 H 27500000 9/10 AUTO QPSK
-S 12070000 H 27500000 3/4
-S2 12109000 H 27500000 9/10 AUTO QPSK
-# Astra2Connect
-# S2 12148000 H 27500000 3/4 AUTO 8PSK
-S 12168000 V 27500000 3/4
-# Astra2Connect
-# S2 12226000 H 27500000 3/5 AUTO 8PSK
-# Astra2Connect
-# S2 12304000 H 27500000 5/6 AUTO 8PSK
-# Astra2Connect
-# S2 12344000 H 28200000 5/6 AUTO 8PSK
-# Astra2Connect
-# S2 12382000 H 27500000 3/4 AUTO 8PSK
-S 12525000 H 27500000 3/4
-S 12525000 V 27500000 3/4
-S 12565000 H 27500000 2/3
-S 12565000 V 27500000 3/4
-S2 12605000 H 28500000 9/10 AUTO QPSK
-S2 12605000 V 28500000 9/10 AUTO QPSK
-S 12630000 V 6000000 3/4
-S 12631000 H 6666000 7/8
-S 12636000 V 2277000 5/6
-S 12641000 H 2220000 7/8
-S 12644000 H 2170000 3/4
-S 12649000 H 5600000 5/6
-S 12661000 H 2170000 5/6
-S 12685000 V 27500000 3/4
-S 12696000 H 3255000 1/2
-S 12711000 H 6111000 AUTO
-S 12725000 V 27500000 3/4
diff --git a/dvb-s/Astra-28.2E b/dvb-s/Astra-28.2E
deleted file mode 100644
index 908e4281..00000000
--- a/dvb-s/Astra-28.2E
+++ /dev/null
@@ -1,186 +0,0 @@
-# Astra 28.2E SDT info service transponder
-# freq pol sr fec
-
-## Astra 2A
-# Transponder 1
-S 11720000 H 29500000 3/4
-# Transponder 2
-S 11740000 V 27500000 2/3
-# Transponder 3
-S 11758000 H 27500000 2/3
-# Transponder 4
-S 11778000 V 27500000 2/3
-# Transponder 5
-S 11798000 H 29500000 3/4
-# Transponder 6
-S 11817000 V 27500000 2/3
-# Transponder 7
-S 11836000 H 27500000 2/3
-# Transponder 8
-S 11856000 V 27500000 2/3
-# Transponder 9
-S 11876000 H 27500000 2/3
-# Transponder 10
-S 11895000 V 27500000 2/3
-# Transponder 11
-S 11914000 H 27500000 2/3
-# Transponder 12
-S 11934000 V 27500000 2/3
-# Transponder 13
-S 11954000 H 27500000 2/3
-# Transponder 18
-S 12051000 V 27500000 2/3
-# Transponder 22
-S 12129000 V 27500000 2/3
-# Transponder 23
-S 12148000 H 27500000 2/3
-# Transponder 24
-S 12168000 V 27500000 2/3
-# Transponder 27
-S 12226000 H 27500000 2/3
-# Transponder 28
-S 12246000 V 27500000 2/3
-# Transponder 37
-S 12422000 H 27500000 2/3
-# Transponder 40
-S 12480000 V 27500000 2/3
-
-## Astra 2B
-# Transponder 14
-S 11973000 V 27500000 2/3
-# Transponder 15
-S 11992000 H 27500000 2/3
-# Transponder 16
-S 12012000 V 27500000 2/3
-# Transponder 17
-S 12032000 H 27500000 2/3
-# Transponder 19
-S 12070000 H 27500000 2/3
-# Transponder 20
-S 12090000 V 27500000 2/3
-# Transponder 21
-S 12110000 H 27500000 2/3
-# Transponder 25
-S 12188000 H 27500000 2/3
-# Transponder 26
-S 12207000 V 27500000 2/3
-# Transponder 29
-S 12266000 H 27500000 2/3
-# Transponder 30
-S 12285000 V 27500000 2/3
-# Transponder 31
-S 12304000 H 27500000 2/3
-# Transponder 32
-S 12324000 V 29500000 3/4
-# Transponder 33
-S 12344000 H 29500000 3/4
-# Transponder 34
-S 12363000 V 29500000 3/4
-# Transponder 35
-S 12382000 H 27500000 2/3
-# Transponder 36
-S 12402000 V 27500000 2/3
-# Transponder 38
-S 12441000 V 27500000 2/3
-# Transponder 39
-S 12460000 H 27500000 2/3
-
-## Astra 2D
-# Transponder 41
-S 10714000 H 22000000 5/6
-# Transponder 42
-S 10729000 V 22000000 5/6
-# Transponder 43
-S 10744000 H 22000000 5/6
-# Transponder 44
-S 10758000 V 22000000 5/6
-# Transponder 45
-S 10773000 H 22000000 5/6
-# Transponder 46
-S 10788000 V 22000000 5/6
-# Transponder 47
-S 10803000 H 22000000 5/6
-# Transponder 48
-S 10818000 V 22000000 5/6
-# Transponder 49
-S 10832000 H 22000000 5/6
-# Transponder 50
-S 10847000 V 22000000 5/6
-# Transponder 51
-S 10862000 H 22000000 5/6
-# Transponder 52
-S 10876000 V 22000000 5/6
-# Transponder 53
-S 10891000 H 22000000 5/6
-# Transponder 54
-S 10906000 V 22000000 5/6
-# Transponder 55
-S 10921000 H 22000000 5/6
-# Transponder 56
-S 10936000 V 22000000 5/6
-
-## Eurobird 1
-# Transponder C1
-S 11222170 H 27500000 2/3
-# Transponder C2
-S 11223670 V 27500000 2/3
-# Transponder C2
-S 11259000 V 27500000 2/3
-# Transponder C1
-S 11261000 H 27500000 2/3
-# Transponder C3
-S 11307000 H 27500000 2/3
-# Transponder C4
-S 11307000 V 27500000 2/3
-# Transponder C4
-S 11343000 V 27500000 2/3
-# Transponder C3
-S 11344000 H 27500000 2/3
-# Transponder C5
-S 11390000 H 27500000 2/3
-# Transponder C6
-S 11390000 V 27500000 2/3
-# Transponder C5
-S 11426000 H 27500000 2/3
-# Transponder C6
-S 11426000 V 27500000 2/3
-# Transponder D1
-S 11469000 H 27500000 2/3
-# Transponder D2S
-S 11488000 V 27500000 2/3
-# Transponder D3S
-S 11508000 H 27500000 2/3
-# Transponder D4S
-S 11527000 V 27500000 2/3
-# Transponder D5
-S 11546000 H 27500000 2/3
-# Transponder D6
-S 11565000 V 27500000 2/3
-# Transponder D7
-S 11585000 H 27500000 2/3
-# Transponder D8
-S 11603850 V 27500000 2/3
-# Transponder D9
-S 11623000 H 27500000 2/3
-# Transponder D10
-S 11642000 V 27500000 2/3
-# Transponder D11
-S 11661540 H 27500000 2/3
-# Transponder D12
-S 11680770 V 27500000 2/3
-# Transponder F1
-S 12524000 H 27500000 2/3
-# Transponder F2
-S 12524000 V 27500000 2/3
-# Transponder F1
-S 12560000 H 27500000 2/3
-# Transponder F2
-S 12560000 V 27500000 2/3
-# Transponder F4
-S 12596000 V 27500000 2/3
-# Transponder F3
-S 12607000 H 27500000 3/4
-# Transponder F4
-S 12629000 V 6111000 3/4
-# Transponder F5
-S 12692000 V 19532000 1/2
diff --git a/dvb-s/Atlantic-Bird-1-12.5W b/dvb-s/Atlantic-Bird-1-12.5W
deleted file mode 100644
index 6735d70f..00000000
--- a/dvb-s/Atlantic-Bird-1-12.5W
+++ /dev/null
@@ -1,30 +0,0 @@
-# Atlantic Bird 1 @ 12.5W
-# freq pol sr fec
-S 11099000 H 2000000 5/6
-S 11132000 H 3255000 3/4
-S 11136000 V 3700000 5/6
-S 11174000 H 15190000 3/4
-S 11179000 V 22400000 2/3
-S 11188000 H 5722000 5/6
-S 11332000 H 6428000 2/3
-S 11337000 H 1923000 7/8
-S 11340000 H 2279000 5/6
-S 11355000 H 11781000 7/8
-S 11408000 V 27500000 3/4
-S 11428000 H 30000000 5/6
-S 11595000 V 27500000 5/6
-S 11622000 H 3255000 AUTO
-S 11643000 H 2398000 AUTO
-S 11645000 V 4790000 AUTO
-S 11651000 V 3688000 AUTO
-S 12515000 H 17455000 3/4
-S 12535000 V 2000000 3/4
-S 12545000 H 17455000 3/4
-S 12594000 H 2170000 3/4
-S 12597000 H 1730000 3/4
-S 12604000 H 1481000 3/4
-S 12655000 H 4285000 3/4
-S 12659000 H 2141000 3/4
-S 12662000 V 3928000 3/4
-S 12720000 V 1808000 3/4
-S 12743000 V 3214000 3/4
diff --git a/dvb-s/Atlantic-Bird-3-5.0W b/dvb-s/Atlantic-Bird-3-5.0W
deleted file mode 100644
index 4e7f0076..00000000
--- a/dvb-s/Atlantic-Bird-3-5.0W
+++ /dev/null
@@ -1,4 +0,0 @@
-# Atlantic Bird 3 @ 5.0W
-# freq pol sr fec
-S 11096000 V 29950000 7/8
-S 11591000 V 20000000 2/3
diff --git a/dvb-s/BrasilSat-B1-75.0W b/dvb-s/BrasilSat-B1-75.0W
deleted file mode 100644
index 9349d935..00000000
--- a/dvb-s/BrasilSat-B1-75.0W
+++ /dev/null
@@ -1,11 +0,0 @@
-# Brasilsat B1 @ 75.0W
-# freq pol sr fec
-
-S 3648000 V 04285000 AUTO
-S 3657000 V 06620000 AUTO
-S 3653000 V 04710000 AUTO
-S 3655000 H 06620000 AUTO
-S 3629000 H 06620000 AUTO
-S 3711000 H 03200000 AUTO
-S 3644000 V 04440000 AUTO
-S 3638000 H 04440000 AUTO
diff --git a/dvb-s/BrasilSat-B2-65.0W b/dvb-s/BrasilSat-B2-65.0W
deleted file mode 100644
index 383c223c..00000000
--- a/dvb-s/BrasilSat-B2-65.0W
+++ /dev/null
@@ -1,34 +0,0 @@
-# Brasilsat B2 @ 65.0W
-# freq pol sr fec
-
-S 3745000 H 03540000 AUTO
-S 4008000 H 03333000 AUTO
-S 4011000 V 05000000 AUTO
-S 3792000 V 03393000 AUTO
-S 4104000 V 03214000 AUTO
-S 4097000 V 06667000 AUTO
-S 3905000 H 06666000 AUTO
-S 3935000 H 06666000 AUTO
-S 3890000 H 06666000 AUTO
-S 3925000 H 06666000 AUTO
-S 4112000 V 04285000 AUTO
-S 3650000 V 04440000 AUTO
-S 3736000 H 01808000 AUTO
-S 3787000 H 06666000 AUTO
-S 3876000 V 02740000 AUTO
-S 4117000 V 02963000 AUTO
-S 3815000 H 06666000 AUTO
-S 3793000 H 06666000 AUTO
-S 3721000 H 02963000 AUTO
-S 3684000 H 06666000 AUTO
-S 3915000 H 06666000 AUTO
-S 3766000 H 03336000 AUTO
-S 3847000 H 04444000 AUTO
-S 3706000 H 02462000 AUTO
-S 3667000 H 07236000 AUTO
-S 3771000 V 01480000 AUTO
-S 3734000 V 02852000 AUTO
-S 3810000 H 13333000 AUTO
-S 3762000 H 02222000 AUTO
-S 3834000 H 03572000 AUTO
-S 3850000 H 01570000 AUTO
diff --git a/dvb-s/BrasilSat-B3-84.0W b/dvb-s/BrasilSat-B3-84.0W
deleted file mode 100644
index 5ad005e1..00000000
--- a/dvb-s/BrasilSat-B3-84.0W
+++ /dev/null
@@ -1,85 +0,0 @@
-# Brasilsat B3 @ 84.0W
-# freq pol sr fec
-
-S 3728000 H 04340000 AUTO
-S 3698000 V 03333000 AUTO
-S 4054000 V 01287000 AUTO
-S 3745000 H 04300000 AUTO
-S 3738000 V 04708000 AUTO
-S 3923000 V 01808000 AUTO
-S 3768000 V 08000000 AUTO
-S 3955000 V 04340000 AUTO
-S 4167000 H 03255000 AUTO
-S 3791000 V 03330000 AUTO
-S 3866000 H 04425000 AUTO
-S 3932000 V 03255000 AUTO
-S 4132000 V 02532000 AUTO
-S 3906000 H 03928000 AUTO
-S 3858000 V 04288000 AUTO
-S 3665000 V 03177000 AUTO
-S 3732000 V 03214000 AUTO
-S 3774000 H 03330000 AUTO
-S 3927000 V 03255000 AUTO
-S 3710000 H 03261000 AUTO
-S 3883000 H 04278000 AUTO
-S 3770000 H 03333000 AUTO
-S 3754000 V 05000000 AUTO
-S 3764000 H 04285000 AUTO
-S 3910000 H 03616000 AUTO
-S 3705000 H 04280000 AUTO
-S 3852000 V 03806000 AUTO
-S 3845000 H 10127000 AUTO
-S 3936000 V 03255000 AUTO
-S 3653000 V 03807000 AUTO
-S 3751000 H 03565000 AUTO
-S 3871000 H 04435000 AUTO
-S 3895000 H 04430000 AUTO
-S 3936000 H 03255000 AUTO
-S 3800000 H 03255000 AUTO
-S 3855000 H 04000000 AUTO
-S 4171000 H 02170000 AUTO
-S 3716000 H 04800000 AUTO
-S 4068000 H 02600000 AUTO
-S 4070000 V 02964000 AUTO
-S 3949000 V 04340000 AUTO
-S 3684000 V 03200000 AUTO
-S 4169000 V 08140000 AUTO
-S 4144000 H 02734000 AUTO
-S 3736000 H 04285000 AUTO
-S 3790000 H 10444000 AUTO
-S 3724000 V 02075000 AUTO
-S 4121000 H 02500000 AUTO
-S 3629000 H 06666000 AUTO
-S 3970000 V 04445000 AUTO
-S 3985000 V 03300000 AUTO
-S 3916000 H 03255000 AUTO
-S 4155000 V 03255000 AUTO
-S 3692000 V 03330000 AUTO
-S 3644000 V 04687000 AUTO
-S 4087000 H 17200000 AUTO
-S 3889000 H 04440000 AUTO
-S 4176000 V 03515000 AUTO
-S 3829000 V 04340000 AUTO
-S 3805000 V 02662000 AUTO
-S 3943000 V 02460000 AUTO
-S 3757000 H 03565000 AUTO
-S 3696000 H 01808000 AUTO
-S 3989000 V 02666000 AUTO
-S 3690000 V 03200000 AUTO
-S 3657000 V 03600000 AUTO
-S 3996000 V 02300000 AUTO
-S 3926000 H 04000000 AUTO
-S 4126000 H 04000000 AUTO
-S 4136000 H 02142000 AUTO
-S 3675000 V 04285000 AUTO
-S 3931000 H 04000000 AUTO
-S 3786000 V 04286000 AUTO
-S 3688000 V 02308000 AUTO
-S 4075000 V 04444000 AUTO
-S 3911000 V 03255000 AUTO
-S 3824000 H 03002000 AUTO
-S 3778000 V 06850000 AUTO
-S 3710000 V 12960000 AUTO
-S 3877000 H 04450000 AUTO
-S 3940000 V 03255000 AUTO
-S 4064000 H 03300000 AUTO
diff --git a/dvb-s/BrasilSat-B4-70.0W b/dvb-s/BrasilSat-B4-70.0W
deleted file mode 100644
index 9ff8c1b2..00000000
--- a/dvb-s/BrasilSat-B4-70.0W
+++ /dev/null
@@ -1,39 +0,0 @@
-# Brasilsat B4 @ 70.0W
-# freq pol sr fec
-
-S 3951000 H 03214000 AUTO
-S 3714000 V 04400000 AUTO
-S 3672000 H 04713000 AUTO
-S 3955000 H 04400000 AUTO
-S 3965000 V 02930000 AUTO
-S 3628000 H 03000000 AUTO
-S 3644000 V 03214000 AUTO
-S 3650000 H 04285000 AUTO
-S 3688000 H 06000000 AUTO
-S 3680000 H 06000000 AUTO
-S 3662000 V 04606000 AUTO
-S 3945000 H 03214000 AUTO
-S 3640000 H 03263000 AUTO
-S 3979000 V 03617000 AUTO
-S 3752000 V 06220000 AUTO
-S 3685000 V 04500000 AUTO
-S 3650000 V 04400000 AUTO
-S 3985000 H 02170000 AUTO
-S 4010000 H 13021000 AUTO
-S 3665000 H 04700000 AUTO
-S 3637000 H 02228000 AUTO
-S 3708000 V 03928000 AUTO
-S 4047000 V 07143000 AUTO
-S 3672000 V 08454000 AUTO
-S 3820000 V 27500000 AUTO
-S 3940000 V 27500000 AUTO
-S 3964000 H 01875000 AUTO
-S 3695000 H 03598000 AUTO
-S 3900000 V 27500000 AUTO
-S 3645000 H 03520000 AUTO
-S 3983000 V 01630000 AUTO
-S 3631000 H 04687000 AUTO
-S 3874000 V 05926000 AUTO
-S 3700000 V 09123000 AUTO
-S 3997000 V 02300000 AUTO
-S 3973000 V 04338000 AUTO
diff --git a/dvb-s/Chinastar1_C-87.5E b/dvb-s/Chinastar1_C-87.5E
deleted file mode 100644
index 0c03cfc2..00000000
--- a/dvb-s/Chinastar1_C-87.5E
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChinaStar 1 @ 87.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Myawady TV
-S 3734000 H 5925000 3/4
-
-# Zam TV Tests
-S 4076000 H 2532000 3/4
-
-# Test Card
-S 4081000 H 4687000 3/4
diff --git a/dvb-s/Estrela-do-Sul-63.0W b/dvb-s/Estrela-do-Sul-63.0W
deleted file mode 100644
index fc3cfa02..00000000
--- a/dvb-s/Estrela-do-Sul-63.0W
+++ /dev/null
@@ -1,27 +0,0 @@
-# Estrela do Sul @ 63.0W
-# freq pol sr fec
-
-S 11892000 V 02964000 AUTO
-S 11987000 H 03330000 AUTO
-S 12054000 H 26660000 AUTO
-S 11830000 V 06000000 AUTO
-S 11603000 V 03124000 AUTO
-S 11598000 V 03124000 AUTO
-S 11803000 V 04444000 AUTO
-S 11958000 H 04444000 AUTO
-S 11610000 V 03124000 AUTO
-S 11861000 V 02964000 AUTO
-S 11879000 V 02964000 AUTO
-S 11903000 V 02362000 AUTO
-S 11817000 V 06666000 AUTO
-S 11577000 V 03124000 AUTO
-S 11582000 V 03124000 AUTO
-S 11982000 H 08888000 AUTO
-S 11888000 V 02392000 AUTO
-S 11898000 V 02480000 AUTO
-S 11871000 V 02000000 AUTO
-S 11795000 V 04444000 AUTO
-S 11845000 V 04444000 AUTO
-S 11640000 V 18100000 AUTO
-S 11875000 V 03333000 AUTO
-S 11543000 V 10410000 AUTO
diff --git a/dvb-s/Eurobird1-28.5E b/dvb-s/Eurobird1-28.5E
deleted file mode 100644
index 5fd4a907..00000000
--- a/dvb-s/Eurobird1-28.5E
+++ /dev/null
@@ -1,5 +0,0 @@
-# Eurobird 28.5E SDT info service transponder
-# freq pol sr fec
-S 11623000 H 27500000 2/3
-S 11224000 V 27500000 2/3
-S 11527000 V 27500000 2/3
diff --git a/dvb-s/Eurobird9-9.0E b/dvb-s/Eurobird9-9.0E
deleted file mode 100644
index 925980a8..00000000
--- a/dvb-s/Eurobird9-9.0E
+++ /dev/null
@@ -1,16 +0,0 @@
-# Eurobird 9.0E
-# freq pol sr fec
-S 11727000 V 27500000 5/6
-S 11747000 H 27500000 3/4
-S 11766000 V 27500000 5/6
-S 11785000 H 27500000 3/4
-S 11804000 V 27500000 3/4
-S 11823000 H 27500000 3/4
-S 11843000 V 27500000 3/4
-S 11881000 V 26700000 3/4
-S 11919000 V 27500000 5/6
-S 11938000 H 27500000 3/4
-S 11977000 H 27500000 3/4
-S 11996000 V 27500000 3/4
-S 12054000 H 27500000 3/4
-S 12092000 H 27500000 3/4
diff --git a/dvb-s/EutelsatW2-16E b/dvb-s/EutelsatW2-16E
deleted file mode 100644
index 40023a80..00000000
--- a/dvb-s/EutelsatW2-16E
+++ /dev/null
@@ -1,59 +0,0 @@
-# Eutelsat W2 @ 16E
-# freq pol sr fec
-
-S 10957000 H 2821000 AUTO
-S 10968000 H 6400000 AUTO
-S 10972000 V 27500000 AUTO
-S 10976000 H 6400000 AUTO
-S 10989000 H 6400000 AUTO
-S 10997000 H 6400000 AUTO
-S 11005000 H 6400000 AUTO
-S 11011000 V 27500000 AUTO
-S 11015000 H 6400000 AUTO
-S 11025000 H 2894000 AUTO
-S 11046000 H 10555000 AUTO
-S 11057000 H 3327000 AUTO
-S 11061000 H 5722000 AUTO
-S 11078000 H 5208000 AUTO
-S 11092000 V 32000000 AUTO
-S 11094000 H 2734000 AUTO
-S 11132000 V 14185000 AUTO
-S 11178000 V 27500000 AUTO
-S 11192000 H 2667000 AUTO
-S 11267000 H 2170000 AUTO
-S 11276000 H 11100000 AUTO
-S 11294000 H 13333000 AUTO
-S 11304000 V 30000000 AUTO
-S 11324000 H 27500000 AUTO
-S 11428000 V 30000000 AUTO
-S 11449000 H 27500000 AUTO
-S 11471000 V 29950000 AUTO
-S 11492000 H 29950000 AUTO
-S 11513000 V 29950000 AUTO
-S 11534000 H 30000000 AUTO
-S 11554000 V 30000000 AUTO
-S 11575000 H 30000000 AUTO
-S 11594000 V 28800000 AUTO
-S 11617000 H 29950000 AUTO
-S 11634000 V 17578000 AUTO
-S 11658000 H 30000000 AUTO
-S 11659000 V 17578000 AUTO
-S 11682000 V 14468000 AUTO
-S 12538000 V 4340000 AUTO
-S 12549000 V 2894000 AUTO
-S 12555000 H 5632000 AUTO
-S 12557000 V 2156000 AUTO
-S 12562000 H 5632000 AUTO
-S 12563000 V 2222000 AUTO
-S 12568000 H 3703000 AUTO
-S 12625000 V 4444000 AUTO
-S 12633000 V 4883000 AUTO
-S 12642000 V 3418000 AUTO
-S 12650000 H 15000000 AUTO
-S 12656000 V 4883000 AUTO
-S 12677000 V 6111000 AUTO
-S 12683000 H 2894000 AUTO
-S 12703000 H 2748000 AUTO
-S 12716000 H 6000000 AUTO
-S 12723000 H 3000000 AUTO
-S 12733000 V 16277000 AUTO
diff --git a/dvb-s/Express-3A-11.0W b/dvb-s/Express-3A-11.0W
deleted file mode 100644
index 1deef03d..00000000
--- a/dvb-s/Express-3A-11.0W
+++ /dev/null
@@ -1,4 +0,0 @@
-# Express 3A @ 11.0W
-# freq pol sr fec
-
-S 3675000 V 29623000 AUTO
diff --git a/dvb-s/ExpressAM1-40.0E b/dvb-s/ExpressAM1-40.0E
deleted file mode 100644
index 3ffbf019..00000000
--- a/dvb-s/ExpressAM1-40.0E
+++ /dev/null
@@ -1,5 +0,0 @@
-# Express AM1 @ 40E
-# freq pol sr fec
-S 10967000 V 20000000 AUTO
-S 10995000 V 20000000 AUTO
-S 11097000 H 4000000 AUTO
diff --git a/dvb-s/ExpressAM2-80.0E b/dvb-s/ExpressAM2-80.0E
deleted file mode 100644
index 0a9a9903..00000000
--- a/dvb-s/ExpressAM2-80.0E
+++ /dev/null
@@ -1,35 +0,0 @@
-# Express AM2 @ 80E
-# freq pol sr fec
-S 10973000 V 4444000 AUTO
-S 10991000 V 4444000 AUTO
-S 11044000 H 44948000 AUTO
-S 11081000 V 5064000 AUTO
-S 11088000 V 4548000 AUTO
-S 11191000 H 3255000 AUTO
-S 11462000 V 3200000 AUTO
-S 11478000 H 4400000 AUTO
-S 11544000 V 44950000 AUTO
-S 11606000 V 44948000 AUTO
-S 11650000 V 3500000 AUTO
-
-# Express AM2 @ 80E C-BAND
-# Generated by Roman Kashcheev
-# Mar 30, 2008
-# freq pol sr fec
-
-# RSCC
-S 3525000 V 31106000 3/4
-# TRK Sever
-S 3558000 V 3215000 3/4
-# TRV Muji
-S 3562000 V 3225000 3/4
-# OTV Sakhalin
-S 3625000 V 3000000 3/4
-# RSCC
-S 3675000 V 33483000 7/8
-# 5 Kanal
-S 3929000 H 8705000 3/4
-# TV Centr
-S 4147000 V 27500000 3/4
-# Blagovest Telekanal
-S 4175000 V 6510000 3/4
diff --git a/dvb-s/ExpressAM22-53.0E b/dvb-s/ExpressAM22-53.0E
deleted file mode 100644
index 3749e7f5..00000000
--- a/dvb-s/ExpressAM22-53.0E
+++ /dev/null
@@ -1,9 +0,0 @@
-# Express AM 22 @ 53E
-# freq pol sr fec
-S 11044000 V 44950000 3/4
-S 10974000 H 8150000 3/4
-#S 10974000 V 32223000 7/8
-S 11031000 H 3750000 3/4
-S 11096000 V 6400000 3/4
-S 11124000 V 7593000 3/4
-S 11161000 V 5785000 3/4
diff --git a/dvb-s/Galaxy10R-123w b/dvb-s/Galaxy10R-123w
deleted file mode 100644
index bd915f7a..00000000
--- a/dvb-s/Galaxy10R-123w
+++ /dev/null
@@ -1,10 +0,0 @@
-# Galaxy 10R @ 123W
-# freq pol sr fec
-
-S 11720000 V 27692000 AUTO
-S 11732000 H 13240000 AUTO
-S 11800000 V 26657000 AUTO
-S 11805000 H 04580000 AUTO
-S 11966000 V 13021000 AUTO
-S 12104000 V 02222000 AUTO
-S 12114000 V 04444000 AUTO
diff --git a/dvb-s/Galaxy11-91w b/dvb-s/Galaxy11-91w
deleted file mode 100644
index 81aa25bc..00000000
--- a/dvb-s/Galaxy11-91w
+++ /dev/null
@@ -1,49 +0,0 @@
-# Galaxy 11 @ 91W
-# freq pol sr fec
-
-S 10964000 V 19850000 AUTO
-S 10994000 V 20000000 AUTO
-S 11024000 V 20000000 AUTO
-S 11806000 V 03979000 AUTO
-S 11815000 V 03979000 AUTO
-S 11825000 V 06111000 AUTO
-S 11925000 V 03979000 AUTO
-S 11930000 V 03979000 AUTO
-S 11935000 V 03979000 AUTO
-S 11940000 V 03979000 AUTO
-S 11945000 V 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11950000 V 03979000 AUTO
-S 11955000 H 03979000 AUTO
-S 11955000 V 03979000 AUTO
-S 11960000 H 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11975000 V 03979000 AUTO
-S 11975000 H 03979000 AUTO
-S 11980000 V 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11985000 V 03979000 AUTO
-S 11990000 H 03979000 AUTO
-S 11990000 V 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 11995000 V 03979000 AUTO
-S 12000000 H 03979000 AUTO
-S 12005000 V 03979000 AUTO
-S 12010000 H 03979000 AUTO
-S 12010000 V 03979000 AUTO
-S 12015000 H 03979000 AUTO
-S 12015000 V 03979000 AUTO
-S 12020000 V 03979000 AUTO
-S 12025000 V 03979000 AUTO
-S 12030000 V 03979000 AUTO
-S 12035000 V 03979000 AUTO
-S 12066000 H 05632000 AUTO
-S 12075000 H 03979000 AUTO
-S 12083000 H 05632000 AUTO
-S 12086000 V 06144000 AUTO
-S 12096000 V 06144000 AUTO
-S 12104000 V 06144000 AUTO
-S 12114000 V 06144000 AUTO
diff --git a/dvb-s/Galaxy25-97w b/dvb-s/Galaxy25-97w
deleted file mode 100644
index be6e7cce..00000000
--- a/dvb-s/Galaxy25-97w
+++ /dev/null
@@ -1,19 +0,0 @@
-# Galaxy 25 @ 97W
-# freq pol sr fec
-
-S 11789000 V 28125000 AUTO
-S 11836000 V 20770000 AUTO
-S 11867000 V 22000000 AUTO
-S 11874000 H 22000000 AUTO
-S 11898000 V 22000000 AUTO
-S 11936000 H 20000000 AUTO
-S 11966000 H 22000000 AUTO
-S 11991000 V 22000000 AUTO
-S 11999000 H 20000000 AUTO
-S 12053000 V 22000000 AUTO
-S 12084000 V 22000000 AUTO
-S 12090000 H 20000000 AUTO
-S 12115000 V 22425000 AUTO
-S 12146000 V 22000000 AUTO
-S 12152000 H 20000000 AUTO
-S 12177000 V 23000000 AUTO
diff --git a/dvb-s/Galaxy26-93w b/dvb-s/Galaxy26-93w
deleted file mode 100644
index 9388a1ae..00000000
--- a/dvb-s/Galaxy26-93w
+++ /dev/null
@@ -1,58 +0,0 @@
-# Galaxy 26 @ 93W
-# freq pol sr fec
-
-S 11711000 V 14312000 AUTO
-S 11721000 V 03979000 AUTO
-S 11727000 V 03979000 AUTO
-S 11732000 V 03979000 AUTO
-S 11737000 V 03979000 AUTO
-S 11737000 H 03979000 AUTO
-S 11742000 V 03979000 AUTO
-S 11748000 V 03979000 AUTO
-S 11753000 V 03979000 AUTO
-S 11767000 V 03979000 AUTO
-S 11772000 V 03979000 AUTO
-S 11772000 H 03979000 AUTO
-S 11777000 V 03979000 AUTO
-S 11782000 V 03979000 AUTO
-S 11788000 V 03979000 AUTO
-S 11793000 V 03979000 AUTO
-S 11809000 V 03979000 AUTO
-S 11814000 V 03979000 AUTO
-S 11841000 H 04000000 AUTO
-S 11887000 V 03979000 AUTO
-S 11893000 V 03979000 AUTO
-S 11904000 H 03010000 AUTO
-S 11919000 V 03979000 AUTO
-S 11924000 V 03979000 AUTO
-S 11926000 H 08848000 AUTO
-S 11929000 V 03979000 AUTO
-S 11935000 V 03979000 AUTO
-S 11936000 H 08848000 AUTO
-S 11944000 H 08848000 AUTO
-S 11949000 V 03979000 AUTO
-S 11954000 V 03979000 AUTO
-S 11956000 H 03979000 AUTO
-S 11960000 V 03979000 AUTO
-S 11961000 H 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11967000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11972000 H 03979000 AUTO
-S 11977000 H 03979000 AUTO
-S 12047000 V 03979000 AUTO
-S 12048000 H 03979000 AUTO
-S 12054000 H 03979000 AUTO
-S 12058000 V 03979000 AUTO
-S 12059000 H 03979000 AUTO
-S 12063000 V 03979000 AUTO
-S 12064000 H 03979000 AUTO
-S 12069000 H 03979000 AUTO
-S 12076000 V 08681000 AUTO
-S 12089000 V 06511000 AUTO
-S 12110000 H 04104000 AUTO
-S 12116000 H 03979000 AUTO
-S 12121000 H 03979000 AUTO
-S 12126000 H 03979000 AUTO
-S 12132000 H 03979000 AUTO
-S 12175000 V 05147000 AUTO
diff --git a/dvb-s/Galaxy27-129w b/dvb-s/Galaxy27-129w
deleted file mode 100644
index 9f8eb78a..00000000
--- a/dvb-s/Galaxy27-129w
+++ /dev/null
@@ -1,4 +0,0 @@
-# Galaxy 27 @ 129W
-# freq pol sr fec
-
-S 11964000 H 02920000 AUTO
diff --git a/dvb-s/Galaxy28-89w b/dvb-s/Galaxy28-89w
deleted file mode 100644
index 15a6e546..00000000
--- a/dvb-s/Galaxy28-89w
+++ /dev/null
@@ -1,41 +0,0 @@
-# Galaxy 28 @ 89W
-# freq pol sr fec
-
-S 11717000 H 04411000 AUTO
-S 11747000 H 06620000 AUTO
-S 11756000 H 06620000 AUTO
-S 11780000 H 29000000 AUTO
-S 11800000 H 27500000 AUTO
-S 11825000 H 04552000 AUTO
-S 11865000 H 03700000 AUTO
-S 11882000 H 04883000 AUTO
-S 11925000 H 03979000 AUTO
-S 11930000 H 03979000 AUTO
-S 11935000 H 03979000 AUTO
-S 11936000 H 06000000 AUTO
-S 11940000 H 03979000 AUTO
-S 11945000 H 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11955000 V 19532000 AUTO
-S 11960000 H 28800000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11975000 V 03979000 AUTO
-S 11980000 H 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11989000 V 06111000 AUTO
-S 11990000 H 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 12000000 H 28800000 AUTO
-S 12009000 V 06111000 AUTO
-S 12032000 H 06666000 AUTO
-S 12092000 H 02314000 AUTO
-S 12114000 H 14398000 AUTO
-S 12134000 H 04000000 AUTO
-S 12164000 H 03979000 AUTO
-S 12170000 H 03979000 AUTO
-S 12175000 H 03979000 AUTO
-S 12180000 H 03979000 AUTO
-S 12185000 H 03979000 AUTO
-S 12191000 H 03979000 AUTO
-S 12196000 H 03979000 AUTO
diff --git a/dvb-s/Galaxy3C-95w b/dvb-s/Galaxy3C-95w
deleted file mode 100644
index 9d1e0d62..00000000
--- a/dvb-s/Galaxy3C-95w
+++ /dev/null
@@ -1,4 +0,0 @@
-# Galaxy 3C @ 95W
-# freq pol sr fec
-
-S 11780000 H 20760000 AUTO
diff --git a/dvb-s/Hispasat-30.0W b/dvb-s/Hispasat-30.0W
index a21592b3..2c200b5c 100644
--- a/dvb-s/Hispasat-30.0W
+++ b/dvb-s/Hispasat-30.0W
@@ -1,43 +1,6 @@
# Hispasat 30.0W
# freq pol sr fec
-
S 11539000 V 24500000 5/6
-S 11749000 V 03520000 AUTO
-S 11760000 V 03260000 AUTO
-S 11766000 V 04500000 AUTO
-S 11776000 V 02387000 AUTO
-S 11783000 V 01200000 AUTO
-S 11787000 V 02500000 AUTO
-S 11807000 V 06510000 AUTO
-S 11823000 V 02387000 AUTO
-S 11884000 V 27500000 AUTO
-S 11907000 V 02592000 AUTO
-S 11917000 V 05681000 AUTO
S 11931000 H 27500000 3/4
-S 11931000 V 02220000 AUTO
-S 11936000 V 05185000 AUTO
-S 11940000 V 01481000 AUTO
-S 11972000 H 27500000 AUTO
-S 11997000 H 04422000 AUTO
-S 12003000 H 05632000 AUTO
-S 12008000 H 06111000 AUTO
-S 12015000 H 03492000 AUTO
S 12015000 V 27500000 3/4
-S 12040000 H 05632000 AUTO
-S 12052000 V 27500000 AUTO
-S 12085000 H 05632000 AUTO
-S 12131000 H 27500000 AUTO
-S 12135000 V 04444000 AUTO
-S 12137000 V 03030000 AUTO
-S 12141000 V 03255000 AUTO
-S 12146000 V 04200000 AUTO
-S 12156000 V 02222000 AUTO
-S 12158000 V 02348000 AUTO
-S 12163000 V 03030000 AUTO
-S 12168000 V 05240000 AUTO
-S 12172000 H 27500000 AUTO
-S 12175000 V 04500000 AUTO
-S 12182000 V 03340000 AUTO
-S 12188000 V 02583000 AUTO
-S 12192000 V 02593000 AUTO
S 12567000 H 19850000 3/4
diff --git a/dvb-s/Hotbird-13.0E b/dvb-s/Hotbird-13.0E
index 7c916a89..f2168dae 100644
--- a/dvb-s/Hotbird-13.0E
+++ b/dvb-s/Hotbird-13.0E
@@ -1,96 +1,3 @@
# EUTELSAT SkyPlex, Hotbird 13E
# freq pol sr fec
S 12539000 H 27500000 3/4
-S 10719000 V 27500000 3/4
-S 10723000 H 29900000 3/4
-S 10757000 V 27500000 3/4
-S 10775000 H 28000000 3/4
-S 10795000 V 27500000 3/4
-S 10834000 V 27500000 3/4
-S 10853000 H 27500000 3/4
-S 10872000 V 27500000 3/4
-S 10892000 H 27500000 3/4
-S 10910000 V 27500000 3/4
-S 10930000 H 27500000 3/4
-S 10949000 V 27500000 3/4
-S 10971000 H 27500000 3/4
-S 10992000 V 27500000 2/3
-S 11013000 H 27500000 3/4
-S 11034000 V 27500000 3/4
-S 11054000 H 27500000 5/6
-S 11075000 V 27500000 3/4
-S 11095000 H 28000000 3/4
-S 11117000 V 27500000 3/4
-S 11137000 H 27500000 3/4
-S 11158000 V 27500000 3/4
-S 11178000 H 27500000 3/4
-S 11200000 V 27500000 5/6
-S 11219000 H 27500000 3/4
-S 11242000 V 27500000 3/4
-S 11278000 V 27500000 3/4
-S 11295000 H 27500000 3/4
-S 11334000 H 27500000 2/3
-S 11355000 V 27500000 3/4
-S 11373000 H 27500000 2/3
-S 11393000 V 27500000 3/4
-S 11411000 H 27500000 5/6
-S 11432000 V 27500000 2/3
-S 11470000 V 27500000 5/6
-S 11488000 H 27500000 3/4
-S 11526000 H 27500000 3/4
-S 11541000 V 22000000 5/6
-S 11565000 H 27500000 3/4
-S 11585000 V 27500000 3/4
-S 11604000 H 27500000 5/6
-S 11623000 V 27500000 3/4
-S 11645000 H 27500000 3/4
-S 11662000 V 27500000 3/4
-S 11677000 H 27500000 3/4
-S 11727000 V 27500000 3/4
-S 11747000 H 27500000 3/4
-S 11765000 V 27500000 2/3
-S 11785000 H 27500000 3/4
-S 11804000 V 27500000 2/3
-S 11823000 H 27500000 3/4
-S 11842000 V 27500000 3/4
-S 11861000 H 27500000 3/4
-S 11880000 V 27500000 3/4
-S 11900000 H 27500000 3/4
-S 11919000 V 27500000 2/3
-S 11938000 H 27500000 3/4
-S 11958000 V 27500000 3/4
-S 11976000 H 27500000 3/4
-S 12015000 H 27500000 3/4
-S 12034000 V 27500000 3/4
-S 12054000 H 27500000 3/4
-S 12072000 V 27500000 3/4
-S 12092000 H 27500000 3/4
-S 12111000 V 27500000 3/4
-S 12149000 V 27500000 3/4
-S 12169000 H 27500000 3/4
-S 12188000 V 27500000 3/4
-S 12207000 H 27500000 3/4
-S 12226000 V 27500000 3/4
-S 12245000 H 27500000 3/4
-S 12264000 V 27500000 3/4
-S 12284000 H 27500000 3/4
-S 12302000 V 27500000 3/4
-S 12322000 H 27500000 3/4
-S 12341000 V 27500000 3/4
-S 12360000 H 27500000 3/4
-S 12379000 V 27500000 3/4
-S 12398000 H 27500000 3/4
-S 12418000 V 27500000 3/4
-S 12437000 H 27500000 3/4
-S 12475000 H 27500000 3/4
-S 12519000 V 27500000 3/4
-S 12558000 V 27500000 3/4
-S 12577000 H 27500000 3/4
-S 12596000 V 27500000 3/4
-S 12616000 H 27500000 3/4
-S 12635000 V 27500000 3/4
-S 12654000 H 27500000 3/4
-S 12673000 V 27500000 3/4
-S 12692000 H 27500000 3/4
-S 12713000 V 27500000 3/4
-S 12731000 H 27500000 3/4
diff --git a/dvb-s/IA5-97w b/dvb-s/IA5-97w
deleted file mode 100644
index 76c3297f..00000000
--- a/dvb-s/IA5-97w
+++ /dev/null
@@ -1,18 +0,0 @@
-# Intelsat Americas 5 @ 97W
-# freq pol sr fec
-
-S 11789000 V 25000000 AUTO
-S 11836000 V 20765000 AUTO
-S 11867000 V 22000000 AUTO
-S 11874000 H 22000000 AUTO
-S 11898000 V 22000000 AUTO
-S 11966000 H 22000000 AUTO
-S 11991000 V 22000000 AUTO
-S 12053000 V 22000000 AUTO
-S 12084000 V 22000000 AUTO
-S 12090000 H 20000000 AUTO
-S 12115000 V 22425000 AUTO
-S 12122000 H 22000000 AUTO
-S 12146000 V 22000000 AUTO
-S 12152000 H 20000000 AUTO
-S 12177000 V 23000000 AUTO
diff --git a/dvb-s/IA6-93w b/dvb-s/IA6-93w
deleted file mode 100644
index eb5d93a8..00000000
--- a/dvb-s/IA6-93w
+++ /dev/null
@@ -1,61 +0,0 @@
-# Intelsat Americas 6 @ 93W
-# freq pol sr fec
-
-S 11711000 V 14312000 AUTO
-S 11721000 V 03979000 AUTO
-S 11727000 V 03979000 AUTO
-S 11732000 V 03979000 AUTO
-S 11737000 V 03979000 AUTO
-S 11737000 H 03979000 AUTO
-S 11742000 V 03979000 AUTO
-S 11748000 V 03979000 AUTO
-S 11753000 V 03979000 AUTO
-S 11767000 V 03979000 AUTO
-S 11772000 V 03979000 AUTO
-S 11772000 H 03979000 AUTO
-S 11777000 V 03979000 AUTO
-S 11782000 V 03979000 AUTO
-S 11788000 V 03979000 AUTO
-S 11793000 V 03979000 AUTO
-S 11809000 V 03979000 AUTO
-S 11814000 V 03979000 AUTO
-S 11827000 V 08429000 AUTO
-S 11836000 H 07179000 AUTO
-S 11841000 H 04000000 AUTO
-S 11865000 V 03516000 AUTO
-S 11887000 V 03979000 AUTO
-S 11893000 V 03979000 AUTO
-S 11904000 V 05000000 AUTO
-S 11919000 V 03979000 AUTO
-S 11924000 V 03979000 AUTO
-S 11926000 H 08848000 AUTO
-S 11929000 V 03979000 AUTO
-S 11935000 V 03979000 AUTO
-S 11936000 H 08848000 AUTO
-S 11944000 H 08848000 AUTO
-S 11949000 V 03979000 AUTO
-S 11954000 V 03979000 AUTO
-S 11956000 H 03979000 AUTO
-S 11960000 V 03979000 AUTO
-S 11961000 H 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11967000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11972000 H 03979000 AUTO
-S 11977000 H 03979000 AUTO
-S 12047000 V 03979000 AUTO
-S 12048000 H 03979000 AUTO
-S 12054000 H 03979000 AUTO
-S 12058000 V 03979000 AUTO
-S 12059000 H 03979000 AUTO
-S 12063000 V 03979000 AUTO
-S 12064000 H 03979000 AUTO
-S 12069000 H 03979000 AUTO
-S 12076000 V 08679000 AUTO
-S 12089000 V 06511000 AUTO
-S 12110000 H 04104000 AUTO
-S 12116000 H 03979000 AUTO
-S 12121000 H 03979000 AUTO
-S 12126000 H 03979000 AUTO
-S 12132000 H 03979000 AUTO
-S 12175000 V 05147000 AUTO
diff --git a/dvb-s/IA7-129w b/dvb-s/IA7-129w
deleted file mode 100644
index 0be1d6e8..00000000
--- a/dvb-s/IA7-129w
+++ /dev/null
@@ -1,4 +0,0 @@
-# Intelsat Americas 7 @ 129W
-# freq pol sr fec
-
-S 11989000 H 02821000 AUTO
diff --git a/dvb-s/IA8-89w b/dvb-s/IA8-89w
deleted file mode 100644
index ba1dd845..00000000
--- a/dvb-s/IA8-89w
+++ /dev/null
@@ -1,34 +0,0 @@
-# Intelsat Americas 8 @ 89W
-# freq pol sr fec
-
-S 11780000 H 29000000 AUTO
-S 11925000 H 03979000 AUTO
-S 11930000 H 03979000 AUTO
-S 11935000 H 03979000 AUTO
-S 11940000 H 03979000 AUTO
-S 11945000 H 03979000 AUTO
-S 11945000 V 03979000 AUTO
-S 11950000 H 03979000 AUTO
-S 11950000 V 03979000 AUTO
-S 11955000 H 03979000 AUTO
-S 11955000 V 03979000 AUTO
-S 11960000 V 03979000 AUTO
-S 11965000 V 03979000 AUTO
-S 11965000 H 03979000 AUTO
-S 11970000 V 03979000 AUTO
-S 11970000 H 03979000 AUTO
-S 11975000 V 03979000 AUTO
-S 11975000 H 03979000 AUTO
-S 11980000 H 03979000 AUTO
-S 11985000 H 03979000 AUTO
-S 11989000 V 06111000 AUTO
-S 11990000 H 03979000 AUTO
-S 11995000 H 03979000 AUTO
-S 12009000 V 06111000 AUTO
-S 12164000 H 03979000 AUTO
-S 12170000 H 03979000 AUTO
-S 12175000 H 03979000 AUTO
-S 12180000 H 03979000 AUTO
-S 12185000 H 03979000 AUTO
-S 12191000 H 03979000 AUTO
-S 12196000 H 03979000 AUTO
diff --git a/dvb-s/Insat2E_C-83.0E b/dvb-s/Insat2E_C-83.0E
deleted file mode 100644
index 8e76b8ef..00000000
--- a/dvb-s/Insat2E_C-83.0E
+++ /dev/null
@@ -1,93 +0,0 @@
-# Insat 2E @ 83.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# NE TV Multiplex
-S 3521000 V 8640000 3/4
-
-# NE TV Multiplex
-S 3537000 V 10800000 3/4
-
-# TV 9 Telugu
-S 3550000 V 3255000 3/4
-
-# S1 Channel
-S 3559000 V 3366000 3/4
-
-# TV 9 Kannada
-S 3581000 V 3255000 3/4
-
-# Jaya TV
-S 3593000 V 8680000 3/4
-
-# Tata Communications Multiplex
-S 3593000 V 9629000 3/4
-
-# Asianet Multiplex
-S 3643000 V 19531000 3/4
-
-# Amrita TV Middle East
-S 3678000 V 5926000 3/4
-
-# Mahaa TV
-S 3689000 V 2893000 3/4
-
-# Tata Communications Multiplex
-S 3696000 V 6111000 3/4
-
-# CNBC India
-S 3760000 V 6500000 3/4
-
-# Raj TV Network Multiplex
-S 3774000 V 13021000 3/4
-
-# UTVi TV
-S 3794000 V 3500000 3/5
-
-# PTC Multiplex (MPEG-4 S/2)
-S 3815000 V 6000000 3/4
-
-# Tata Communications Multiplex
-S 3845000 V 26043000 3/4
-
-# Indiavision
-S 3914000 V 3000000 3/4
-
-# Yes Indiavision
-S 3919000 V 3000000 3/4
-
-# Manorama News International
-S 3923000 V 3000000 3/4
-
-# Tata Communications Multiplex
-S 3934000 V 13021000 3/4
-
-# Raj Musix kanada
-S 3961000 V 6656000 3/4
-
-# TV 9 Multiplex
-S 3974000 V 13333000 3/4
-
-# Asianet Multiplex
-S 4010000 V 19531000 3/4
-
-# Tata Communications Multiplex
-S 4031000 V 7440000 7/8
-
-# RRSat Multiplex
-S 4042000 V 7420000 7/8
-
-# Tata Communications Multiplex
-S 4050000 V 5084000 7/8
-
-# DD national
-S 4070000 V 5000000 3/4
-
-# Indiasign Mulitplex
-S 4091000 V 9230000 7/8
-
-# News Live (MPEG-4 S/2)
-S 4100000 V 4700000 3/4
diff --git a/dvb-s/Insat3A_C-93.5E b/dvb-s/Insat3A_C-93.5E
deleted file mode 100644
index b4430dfe..00000000
--- a/dvb-s/Insat3A_C-93.5E
+++ /dev/null
@@ -1,66 +0,0 @@
-# Insat 3A @ 93.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# DD Bangla
-S 3732000 V 6250000 3/4
-
-# DD Punjab
-S 3740000 V 6250000 3/4
-
-# DD Gujarati
-S 3750000 V 6250000 3/4
-
-# DD Chandana
-S 3759000 V 6250000 3/4
-
-# DD Oriya
-S 3772000 V 6250000 3/4
-
-# DD kashir
-S 3782000 V 6250000 3/4
-
-# DD Sahyadri
-S 3791000 V 8600000 3/4
-
-# DD Malayalam
-S 3812000 V 6250000 3/4
-
-# DD Saptagiri
-S 3820000 V 6250000 3/4
-
-# DD podhigai
-S 3831000 V 8600000 3/4
-
-# DD Himachal Pradesh
-S 3932000 V 6250000 3/4
-
-# DD Jaipur
-S 3940000 V 6250000 3/4
-
-# Madhya Pradesh
-S 3950000 V 6250000 3/4
-
-# DD Uttar Pradesh
-S 3958000 V 6250000 3/4
-
-# DD North East
-S 4092000 V 6250000 3/4
-
-# DD Mizoram
-S 4101000 V 6250000 3/4
-
-# DD Tripura
-S 4109000 V 4250000 3/4
-
-# RTA Afghanistan
-S 4132000 V 4000000 3/4
-
-# RTA Afghanistan Nangarhar
-S 4136000 V 2000000 3/4
-
-# Ariana TV Network Multiplex
-S 4141000 V 5150000 3/4
diff --git a/dvb-s/Insat4A_C-83.0E b/dvb-s/Insat4A_C-83.0E
deleted file mode 100644
index fa272108..00000000
--- a/dvb-s/Insat4A_C-83.0E
+++ /dev/null
@@ -1,93 +0,0 @@
-# Insat 4A @ 83.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# NSTPL Multiplex
-S 3725000 H 26665000 3/4
-
-# Indiasign multiplex
-S 3756000 H 13333000 3/4
-
-# Star TV Multiplex
-S 3777000 H 10900000 3/4
-
-# Essel Shyam Multiplex
-S 3805000 H 28500000 7/8
-
-# Tarang TV Multiplex (MPEG-4 S/2)
-S 3841000 H 6920000 3/4
-
-# CTVN AKD Plus
-S 3853000 H 3265000 3/4
-
-# Kasthuri TV
-S 3857000 H 3462000 3/4
-
-# Kamyab TV
-S 3874000 H 3403000 3/4
-
-# Vanitha TV
-S 3892000 H 3300000 3/4
-
-# Essel Shayam Multiplex
-S 3898000 H 6800000 3/4
-
-# Channel 10 India
-S 3910000 H 3600000 7/8
-
-# Essel Shyam
-S 3923000 H 13000000 3/4
-
-# DY 365
-S 3949000 H 3225000 3/4
-
-# Multiplex
-S 3958000 H 9500000 7/8
-
-# Zee News Uttar Pradesh
-S 3976000 H 3200000 3/4
-
-# ETV Network Multiplex
-S 4004000 H 22220000 5/6
-
-# Essel Shyam
-S 4040000 H 7500000 7/8
-
-# Lamhas Multiplex
-S 4054000 H 13230000 3/4
-
-# Network 18 Multiplex
-S 4072000 H 6500000 3/4
-
-# IBN Lokmat
-S 4078000 H 3250000 3/4
-
-# Live India
-S 4087000 H 3300000 3/4
-
-# Mi Marathi
-S 4091000 H 3000000 3/4
-
-# BBS TV
-S 4100000 H 4750000 3/4
-
-# Manorama News
-S 4115000 H 5555000 3/4
-
-# BAG Films
-S 4134000 H 10600000 3/4
-
-# Zee Network Multiplex
-S 4151000 H 6500000 3/4
-
-# Zee Network Multiplex
-S 4161000 H 6500000 3/4
-
-# Lok Sabha TV
-S 4170000 H 6500000 3/4
-
-# Kolkata TV
-S 4180000 H 3233000 3/4
diff --git a/dvb-s/Insat4B_C-93.5E b/dvb-s/Insat4B_C-93.5E
deleted file mode 100644
index 5431ae0e..00000000
--- a/dvb-s/Insat4B_C-93.5E
+++ /dev/null
@@ -1,51 +0,0 @@
-# Insat 4B @ 93.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Doordarshan Multiplex
-S 3725000 H 27500000 3/4
-
-# DD Dehradun
-S 3750000 H 4250000 3/4
-
-# DD Raipur
-S 3762000 H 4250000 3/4
-
-# DD Ranchi
-S 3768000 H 4250000 3/4
-
-# DD Jammu
-S 3774000 H 4250000 3/4
-
-# DD Hissar
-S 3802000 H 4250000 3/4
-
-# DD Chandigarh
-S 3808000 H 4250000 3/4
-
-# DD Port Blair
-S 3822000 H 4250000 3/4
-
-# DD Bihar
-S 3832000 H 6250000 3/4
-
-# DD North East
-S 3841000 H 6250000 3/4
-
-# Sun network
-S 3885000 H 28000000 3/4
-
-# Doordarshan Multiplex
-S 3925000 H 27500000 3/4
-
-# Sakshi TV
-S 3950000 H 4440000 3/4
-
-# Tata Communications Multiplex
-S 4005000 H 25422000 7/8
-
-# Sun Network
-S 4045000 H 28000000 3/4
diff --git a/dvb-s/Intel4-72.0E b/dvb-s/Intel4-72.0E
deleted file mode 100644
index 3a7b6401..00000000
--- a/dvb-s/Intel4-72.0E
+++ /dev/null
@@ -1,6 +0,0 @@
-# Intel4 @ 72E
-# freq pol sr fec
-S 11533000 V 4220000 AUTO
-S 11638000 H 5632000 AUTO
-S 12518000 V 8232000 AUTO
-S 12526000 V 3266000 AUTO
diff --git a/dvb-s/Intel904-60.0E b/dvb-s/Intel904-60.0E
deleted file mode 100644
index d39362c6..00000000
--- a/dvb-s/Intel904-60.0E
+++ /dev/null
@@ -1,13 +0,0 @@
-# Intel904 @ 60E
-# freq pol sr fec
-S 11003000 H 2975000 AUTO
-S 11011000 H 2975000 AUTO
-S 11015000 H 2975000 AUTO
-S 11093000 V 3980000 AUTO
-S 11101000 V 4105000 AUTO
-S 11142000 H 2963000 AUTO
-S 11152000 H 2963000 AUTO
-S 11157000 H 2963000 AUTO
-S 11515000 V 7300000 AUTO
-S 11635000 V 29700000 AUTO
-S 11675000 V 29700000 AUTO
diff --git a/dvb-s/Intelsat-1002-1.0W b/dvb-s/Intelsat-1002-1.0W
deleted file mode 100644
index 0142ded0..00000000
--- a/dvb-s/Intelsat-1002-1.0W
+++ /dev/null
@@ -1,20 +0,0 @@
-# Intelsat 1002 @ 1.0W
-# freq pol sr fec
-S 4175000 V 28000000 AUTO
-S 4180000 H 21050000 AUTO
-S 11093000 H 19191000 7/8
-S 11166000 V 1450000 7/8
-S 11182000 V 3100000 7/8
-S 11606000 H 13356000 7/8
-S 12527000 H 27500000 3/4
-S 12563000 H 27500000 3/4
-S 12563000 V 27500000 3/4
-S 12607000 H 27500000 3/4
-S 12607000 V 27500000 3/4
-S 12643000 H 27500000 3/4
-S 12643000 V 27500000 3/4
-S 12687000 H 27500000 3/4
-S 12687000 V 27500000 3/4
-S 12718000 V 18400000 3/4
-S 12723000 H 27500000 3/4
-S 12735000 V 8800000 5/6
diff --git a/dvb-s/Intelsat-11-43.0W b/dvb-s/Intelsat-11-43.0W
deleted file mode 100644
index 424f78a2..00000000
--- a/dvb-s/Intelsat-11-43.0W
+++ /dev/null
@@ -1,4 +0,0 @@
-# Intelsat 11 @ 43.0W
-# freq pol sr fec
-
-S 3944000 H 05945000 AUTO
diff --git a/dvb-s/Intelsat-1R-45.0W b/dvb-s/Intelsat-1R-45.0W
deleted file mode 100644
index 15f65744..00000000
--- a/dvb-s/Intelsat-1R-45.0W
+++ /dev/null
@@ -1,44 +0,0 @@
-# Intelsat 1R @ 45.0W
-# freq pol sr fec
-
-S 4104000 V 14450000 AUTO
-S 3854000 H 02370000 AUTO
-S 11893000 H 06620000 AUTO
-S 3869000 H 03515000 AUTO
-S 4186000 V 02000000 AUTO
-S 4040000 V 04347000 AUTO
-S 4071000 V 02615000 AUTO
-S 3991000 V 04044000 AUTO
-S 3882000 V 04410000 AUTO
-S 11788000 V 10000000 AUTO
-S 11728000 V 05057000 AUTO
-S 11737000 V 05057000 AUTO
-S 11722000 V 03000000 AUTO
-S 11718000 H 24667000 AUTO
-S 11833000 H 17360000 AUTO
-S 11930000 V 11790000 AUTO
-S 11808000 H 04779000 AUTO
-S 4132000 H 05749000 AUTO
-S 3780000 V 02941000 AUTO
-S 11705000 V 04440000 AUTO
-S 3759000 V 02941000 AUTO
-S 4171000 V 04410000 AUTO
-S 3899000 V 06611000 AUTO
-S 4192000 H 02075000 AUTO
-S 4096000 H 08102000 AUTO
-S 11873000 H 06000000 AUTO
-S 11856000 V 03000000 AUTO
-S 11746000 V 06900000 AUTO
-S 11715000 V 05500000 AUTO
-S 3985000 V 03310000 AUTO
-S 3892000 V 06110000 AUTO
-S 4135000 H 26600000 AUTO
-S 4121000 H 03510000 AUTO
-S 3742000 V 04444000 AUTO
-S 3910000 V 04292000 AUTO
-S 3975000 V 03310000 AUTO
-S 4133000 V 03255000 AUTO
-S 3785000 V 04409000 AUTO
-S 3868000 V 10075000 AUTO
-S 3774000 V 08820000 AUTO
-S 4128000 V 03310000 AUTO
diff --git a/dvb-s/Intelsat-3R-43.0W b/dvb-s/Intelsat-3R-43.0W
deleted file mode 100644
index d64bc5b7..00000000
--- a/dvb-s/Intelsat-3R-43.0W
+++ /dev/null
@@ -1,35 +0,0 @@
-# Intelsat 3R @ 43.0W
-# freq pol sr fec
-
-S 3936000 H 03310000 AUTO
-S 3901000 V 06620000 AUTO
-S 3891000 V 06111000 AUTO
-S 3935000 V 17360000 AUTO
-S 3872000 H 06620000 AUTO
-S 3736000 H 29270000 AUTO
-S 4106000 V 26470000 AUTO
-S 3910000 V 05632000 AUTO
-S 3919000 V 06620000 AUTO
-S 4083000 V 06599000 AUTO
-S 4106000 H 29270000 AUTO
-S 3994000 H 21090000 AUTO
-S 3867000 V 06429000 AUTO
-S 3958000 V 06500000 AUTO
-S 3980000 V 03500000 AUTO
-S 3828000 V 04350000 AUTO
-S 3888000 H 07813000 AUTO
-S 3785000 H 30800000 AUTO
-S 3942000 V 01200000 AUTO
-S 3946000 V 02592000 AUTO
-S 3988000 V 04070000 AUTO
-S 3845000 H 30800000 AUTO
-S 4040000 H 30800000 AUTO
-S 3865000 V 06900000 AUTO
-S 3850000 V 28800000 AUTO
-S 11705000 H 03700000 AUTO
-S 11745000 H 03111000 AUTO
-S 11711000 H 04687000 AUTO
-S 11754000 H 03109000 AUTO
-S 3746000 V 21261000 AUTO
-S 4150000 H 24570000 AUTO
-S 3930000 H 02812000 AUTO
diff --git a/dvb-s/Intelsat-6B-43.0W b/dvb-s/Intelsat-6B-43.0W
deleted file mode 100644
index a8b4d7a6..00000000
--- a/dvb-s/Intelsat-6B-43.0W
+++ /dev/null
@@ -1,17 +0,0 @@
-# Intelsat 6B @ 43.0W
-# freq pol sr fec
-
-S 10882000 H 30000000 AUTO
-S 10882000 V 30000000 AUTO
-S 10970000 H 30000000 AUTO
-S 10970000 V 30000000 AUTO
-S 11050000 H 30000000 AUTO
-S 11130000 H 30000000 AUTO
-S 11382000 V 30000000 AUTO
-S 11130000 V 30000000 AUTO
-S 10720000 H 30000000 AUTO
-S 10720000 V 30000000 AUTO
-S 11050000 V 30000000 AUTO
-S 11382000 H 30000000 AUTO
-S 10800000 H 30000000 AUTO
-S 10800000 V 30000000 AUTO
diff --git a/dvb-s/Intelsat-705-50.0W b/dvb-s/Intelsat-705-50.0W
deleted file mode 100644
index 48aeec04..00000000
--- a/dvb-s/Intelsat-705-50.0W
+++ /dev/null
@@ -1,7 +0,0 @@
-# Intelsat 705 @ 50.0W
-# freq pol sr fec
-
-S 3911000 V 03617000 AUTO
-S 3917000 V 04087000 AUTO
-S 3838000 H 07053000 AUTO
-S 4126000 H 06111000 AUTO
diff --git a/dvb-s/Intelsat-707-53.0W b/dvb-s/Intelsat-707-53.0W
deleted file mode 100644
index 56dd65f0..00000000
--- a/dvb-s/Intelsat-707-53.0W
+++ /dev/null
@@ -1,5 +0,0 @@
-# Intelsat 707 @ 53.0W
-# freq pol sr fec
-
-S 3820000 V 03255000 AUTO
-S 11483000 V 05333000 AUTO
diff --git a/dvb-s/Intelsat-805-55.5W b/dvb-s/Intelsat-805-55.5W
deleted file mode 100644
index 3d4cff5a..00000000
--- a/dvb-s/Intelsat-805-55.5W
+++ /dev/null
@@ -1,67 +0,0 @@
-# Intelsat 805 @ 55.5W
-# freq pol sr fec
-
-S 4171000 H 06111000 AUTO
-S 4147000 H 06111000 AUTO
-S 3914000 V 01809000 AUTO
-S 3572000 V 11800000 AUTO
-S 4135000 H 06111000 AUTO
-S 3737000 H 01809000 AUTO
-S 3932000 V 03255000 AUTO
-S 3759000 V 04167000 AUTO
-S 3750000 V 05632000 AUTO
-S 3850000 H 20000000 AUTO
-S 4010000 V 06111000 AUTO
-S 3715000 H 08890000 AUTO
-S 3670000 H 01374000 AUTO
-S 4158000 H 01447000 AUTO
-S 3549000 V 06510000 AUTO
-S 3451000 H 04444000 AUTO
-S 3667000 H 03300000 AUTO
-S 3522000 H 30000000 AUTO
-S 4055000 V 21703000 AUTO
-S 3698000 V 03600000 AUTO
-S 4119000 V 01631000 AUTO
-S 3446000 H 03200000 AUTO
-S 3675000 V 02660000 AUTO
-S 3717000 V 11574000 AUTO
-S 4030000 V 06111000 AUTO
-S 3767000 H 04427000 AUTO
-S 4027000 V 02000000 AUTO
-S 4089000 V 05540000 AUTO
-S 3685000 V 05632000 AUTO
-S 3751000 H 05632000 AUTO
-S 4127000 V 02000000 AUTO
-S 3980000 V 19510000 AUTO
-S 3590000 V 10127000 AUTO
-S 4000000 V 05200000 AUTO
-S 3762000 H 03662000 AUTO
-S 3936000 H 03255000 AUTO
-S 3727000 H 03000000 AUTO
-S 4104000 H 05062000 AUTO
-S 3777000 H 07400000 AUTO
-S 3431000 H 03500000 AUTO
-S 3478000 V 05632000 AUTO
-S 4093000 H 02540000 AUTO
-S 3929000 H 02941000 AUTO
-S 4195000 H 04444000 AUTO
-S 4140000 V 04700000 AUTO
-S 4096000 H 05247000 AUTO
-S 3467000 V 04340000 AUTO
-S 3442000 H 03000000 AUTO
-S 4080000 V 04340000 AUTO
-S 4084000 H 10317000 AUTO
-S 3723000 H 03000000 AUTO
-S 3815000 H 26667000 AUTO
-S 4006000 V 03690000 AUTO
-S 3918000 V 04400000 AUTO
-S 3735000 V 08680000 AUTO
-S 3727000 V 03000000 AUTO
-S 3940000 H 02575000 AUTO
-S 3792000 H 02244000 AUTO
-S 3900000 H 03612000 AUTO
-S 3677000 H 04232000 AUTO
-S 4127000 H 02532000 AUTO
-S 4152000 V 03600000 AUTO
-S 4177000 V 27690000 AUTO
-S 4111000 H 03333000 AUTO
diff --git a/dvb-s/Intelsat-9-58.0W b/dvb-s/Intelsat-9-58.0W
deleted file mode 100644
index e8605a92..00000000
--- a/dvb-s/Intelsat-9-58.0W
+++ /dev/null
@@ -1,58 +0,0 @@
-# Intelsat 9 @ 58.0W
-# freq pol sr fec
-
-S 4122000 H 02222000 AUTO
-S 4146000 H 06620000 AUTO
-S 4157000 H 06620000 AUTO
-S 4160000 V 03000000 AUTO
-S 3960000 V 29270000 AUTO
-S 3960000 H 29270000 AUTO
-S 4080000 H 27684000 AUTO
-S 3720000 H 19510000 AUTO
-S 4131000 H 04444000 AUTO
-S 4155000 H 06111000 AUTO
-S 4173000 H 06620000 AUTO
-S 3995000 H 05632000 AUTO
-S 3986000 H 06111000 AUTO
-S 4175000 H 04410000 AUTO
-S 4107000 H 08850000 AUTO
-S 3925000 H 06666000 AUTO
-S 3905000 H 06620000 AUTO
-S 3915000 H 06620000 AUTO
-S 3925000 H 06620000 AUTO
-S 4005000 H 06620000 AUTO
-S 4015000 H 06620000 AUTO
-S 3720000 V 27700000 AUTO
-S 4166000 H 06200000 AUTO
-S 3794000 H 03332000 AUTO
-S 3807000 H 03428000 AUTO
-S 3880000 V 27690000 AUTO
-S 3800000 V 26470000 AUTO
-S 3760000 V 27690000 AUTO
-S 3996000 H 03330000 AUTO
-S 3935000 H 05632000 AUTO
-S 11852000 V 30000000 AUTO
-S 11895000 V 20000000 AUTO
-S 11913000 V 10000000 AUTO
-S 4155000 V 03310000 AUTO
-S 3934000 V 07000000 AUTO
-S 3787000 H 07407000 AUTO
-S 3924000 V 06620000 AUTO
-S 3800000 H 04444000 AUTO
-S 3911000 V 13330000 AUTO
-S 4040000 H 16180000 AUTO
-S 4080000 V 27690000 AUTO
-S 4144000 V 02205000 AUTO
-S 4151000 V 02890000 AUTO
-S 4147000 V 02941000 AUTO
-S 4170000 V 02941000 AUTO
-S 3760000 H 28500000 AUTO
-S 4120000 V 27500000 AUTO
-S 11670000 V 16470000 AUTO
-S 4125000 H 02941000 AUTO
-S 4137000 H 02941000 AUTO
-S 3880000 H 27690000 AUTO
-S 4174000 V 02941000 AUTO
-S 3840000 V 27690000 AUTO
-S 3840000 H 27690000 AUTO
-S 3815000 H 06250000 AUTO
diff --git a/dvb-s/Intelsat-903-34.5W b/dvb-s/Intelsat-903-34.5W
deleted file mode 100644
index 141c42c1..00000000
--- a/dvb-s/Intelsat-903-34.5W
+++ /dev/null
@@ -1,7 +0,0 @@
-# Intelsat 903 @ 34.5W
-# freq pol sr fec
-
-S 4178000 V 32555000 AUTO
-S 4045000 H 04960000 AUTO
-S 3895000 H 13021000 AUTO
-S 4004000 V 02170000 AUTO
diff --git a/dvb-s/Intelsat-905-24.5W b/dvb-s/Intelsat-905-24.5W
deleted file mode 100644
index c5b1c215..00000000
--- a/dvb-s/Intelsat-905-24.5W
+++ /dev/null
@@ -1,9 +0,0 @@
-# Intelsat 905 @ 24.5W
-# freq pol sr fec
-
-S 4171000 V 06111000 AUTO
-S 4181000 V 06111000 AUTO
-S 4194000 V 05193000 AUTO
-S 4162000 V 06111000 AUTO
-S 4060000 V 06111000 AUTO
-S 4070000 V 06111000 AUTO
diff --git a/dvb-s/Intelsat-907-27.5W b/dvb-s/Intelsat-907-27.5W
deleted file mode 100644
index c12f549a..00000000
--- a/dvb-s/Intelsat-907-27.5W
+++ /dev/null
@@ -1,9 +0,0 @@
-# Intelsat 907 @ 27.5W
-# freq pol sr fec
-
-S 3873000 H 04687000 AUTO
-S 3935000 H 04687000 AUTO
-S 3743000 V 02900000 AUTO
-S 3732000 V 14000000 AUTO
-S 3943000 H 01808000 AUTO
-S 3938000 H 03544000 AUTO
diff --git a/dvb-s/Intelsat8_C-166.0E b/dvb-s/Intelsat8_C-166.0E
deleted file mode 100644
index 6c671cce..00000000
--- a/dvb-s/Intelsat8_C-166.0E
+++ /dev/null
@@ -1,39 +0,0 @@
-# Intelsat 8 @ 166.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Viacom Multiplex
-S 3740000 H 27500000 2/3
-
-# South Korean Multiplex
-S 3790000 V 6510000 3/4
-
-# Arirang World
-S 3815000 V 4400000 3/4
-
-# Australian network Multiplex
-S 3829000 H 13238000 3/4
-
-# TVBS multiplex
-S 3833000 V 17500000 3/4
-
-# NBC Universal
-S 3900000 H 27500000 3/4
-
-# Intelsat multiplex
-S 3940000 H 27690000 7/8
-
-# China Radio multiplex
-S 3959000 V 3428000 3/4
-
-# NHK World network Multiplex
-S 4060000 H 16180000 1/2
-
-# Philippines Network TV Multiplex
-S 4122000 V 5554000 3/4
-
-# TAS Multiplex
-S 4130000 V 5800000 3/4
diff --git a/dvb-s/JCSat3A_C-128.0E b/dvb-s/JCSat3A_C-128.0E
deleted file mode 100644
index 71f68d10..00000000
--- a/dvb-s/JCSat3A_C-128.0E
+++ /dev/null
@@ -1,18 +0,0 @@
-# JCSAT 3A @ 128.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# TAS Multiplex
-S 3960000 V 30000000 5/6
-
-# TAS Multiplex
-S 4000000 V 30000000 5/6
-
-# Miraclenet
-S 4055000 V 3332000 3/4
-
-# TAS Multiplex
-S 4120000 V 30000000 5/6
diff --git a/dvb-s/Measat3_C-91.5E b/dvb-s/Measat3_C-91.5E
deleted file mode 100644
index 2753ac0a..00000000
--- a/dvb-s/Measat3_C-91.5E
+++ /dev/null
@@ -1,54 +0,0 @@
-# Measat 3 @ 91.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Shop TV
-S 3629000 V 2200000 3/4
-
-# Aora TV Mulitplex
-S 3644000 H 22320000 3/4
-
-# Solar Entertainment
-S 3645000 V 19510000 3/4
-
-# National Geographic music
-S 3718000 V 1700000 7/8
-
-# DZRH TV Multiplex
-S 3721000 V 2170000 3/4
-
-# Ascent Media (MPEG-4 S/2)
-S 3751000 V 13330000 2/3
-
-# Globecast Multiplex (MPEG-4 S/2)
-S 3769000 V 14000000 3/4
-
-# HTV Multiplex
-S 3796000 V 7030000 3/4
-
-# Sky International
-S 3814000 V 6666000 3/4
-
-# Un-named Mulitplex
-S 3865000 V 3835000 3/4
-
-# RTM Multiplex
-S 3877000 V 12525000 7/8
-
-# RTM Sarawak Feeds
-S 3887000 V 3984000 3/4
-
-# Globecast Multiplex
-S 3920000 V 28000000 7/8
-
-# Ginx TV
-S 4113000 V 2960000 3/4
-
-# YR Asia TV
-S 4117000 V 2963000 3/4
-
-# All Sports Network (MPEG-4 S/2)
-S 4134000 V 7200000 3/4
diff --git a/dvb-s/NSS-10-37.5W b/dvb-s/NSS-10-37.5W
deleted file mode 100644
index 3ebaa718..00000000
--- a/dvb-s/NSS-10-37.5W
+++ /dev/null
@@ -1,12 +0,0 @@
-# NSS 10 @ 37.5W
-# freq pol sr fec
-
-S 4055000 V 02700000 AUTO
-S 3824000 H 01808000 AUTO
-S 4059000 V 03214000 AUTO
-S 3828000 H 02532000 AUTO
-S 3844000 H 04340000 AUTO
-S 4071000 V 03150000 AUTO
-S 4051000 V 04440000 AUTO
-S 4044000 V 03250000 AUTO
-S 4077000 V 03200000 AUTO
diff --git a/dvb-s/NSS-7-22.0W b/dvb-s/NSS-7-22.0W
deleted file mode 100644
index e1eefaf4..00000000
--- a/dvb-s/NSS-7-22.0W
+++ /dev/null
@@ -1,25 +0,0 @@
-# NSS 7 @ 22.0W
-# freq pol sr fec
-
-S 3926000 H 03715000 AUTO
-S 3920000 H 03715000 AUTO
-S 3954000 V 05632000 AUTO
-S 3929000 V 05632000 AUTO
-S 3915000 H 03715000 AUTO
-S 3761000 V 22650000 AUTO
-S 11825000 H 05904000 AUTO
-S 12162000 H 06510000 AUTO
-S 11777000 H 04000000 AUTO
-S 11860000 H 35000000 AUTO
-S 12049000 H 06500000 AUTO
-S 11921000 H 35000000 AUTO
-S 4003000 H 06667000 AUTO
-S 4011000 H 06667000 AUTO
-S 4126000 H 03680000 AUTO
-S 3969000 H 01808000 AUTO
-S 3976000 H 01842000 AUTO
-S 11814000 H 05630000 AUTO
-S 4038000 V 03690000 AUTO
-S 3674000 V 02222000 AUTO
-S 4033000 V 03689000 AUTO
-S 4016000 H 03663000 AUTO
diff --git a/dvb-s/NSS-806-40.5W b/dvb-s/NSS-806-40.5W
deleted file mode 100644
index 8bea0a8d..00000000
--- a/dvb-s/NSS-806-40.5W
+++ /dev/null
@@ -1,108 +0,0 @@
-# NSS 806 @ 40.5W
-# freq pol sr fec
-
-S 11921000 H 35000000 AUTO
-S 3660000 H 04350000 AUTO
-S 3986000 H 03179000 AUTO
-S 3859000 H 02600000 AUTO
-S 4120000 V 02960000 AUTO
-S 4016000 V 05712000 AUTO
-S 3978000 H 03978000 AUTO
-S 4100000 V 06111000 AUTO
-S 3965000 V 02540000 AUTO
-S 3774000 H 06670000 AUTO
-S 3725000 V 26667000 AUTO
-S 3600000 V 25185000 AUTO
-S 3758000 V 26667000 AUTO
-S 3982000 V 17800000 AUTO
-S 4090000 V 02515000 AUTO
-S 4042000 H 08680000 AUTO
-S 4009000 V 06666000 AUTO
-S 4003000 H 06666000 AUTO
-S 3648000 H 02000000 AUTO
-S 3664000 V 02170000 AUTO
-S 3644000 H 02534000 AUTO
-S 3695000 H 02963000 AUTO
-S 4082000 H 06666000 AUTO
-S 4143000 V 04800000 AUTO
-S 3641000 V 02666000 AUTO
-S 3991000 H 03578000 AUTO
-S 4000000 H 02450000 AUTO
-S 4009000 H 02450000 AUTO
-S 3960000 V 03170000 AUTO
-S 3755000 H 20000000 AUTO
-S 4135000 V 02000000 AUTO
-S 4005000 H 02450000 AUTO
-S 4003000 H 02450000 AUTO
-S 3600000 H 29185000 AUTO
-S 3868000 V 02100000 AUTO
-S 3685000 H 06500000 AUTO
-S 3688000 V 06666000 AUTO
-S 3679000 V 02220000 AUTO
-S 3961000 H 01481000 AUTO
-S 4130000 V 02000000 AUTO
-S 3923000 H 27500000 AUTO
-S 4052000 V 02459000 AUTO
-S 4071000 V 03333000 AUTO
-S 4146000 H 02571000 AUTO
-S 3646000 V 03978000 AUTO
-S 3837000 H 19510000 AUTO
-S 4132000 H 02480000 AUTO
-S 3653000 V 05924000 AUTO
-S 4055000 H 07233000 AUTO
-S 3938000 V 04785000 AUTO
-S 4152000 V 03280000 AUTO
-S 3832000 V 13310000 AUTO
-S 4090000 H 06620000 AUTO
-S 4082000 V 06510000 AUTO
-S 4107000 V 02100000 AUTO
-S 3500000 H 06666000 AUTO
-S 4126000 V 02531000 AUTO
-S 3860000 V 02713000 AUTO
-S 3983000 H 02222000 AUTO
-S 4065000 H 08400000 AUTO
-S 4063000 V 08500000 AUTO
-S 3972000 H 03330000 AUTO
-S 4024000 H 16030000 AUTO
-S 3803000 V 26860000 AUTO
-S 3920000 V 20000000 AUTO
-S 4053000 V 06666000 AUTO
-S 3676000 V 03000000 AUTO
-S 3637000 H 02963000 AUTO
-S 3516000 V 05632000 AUTO
-S 3516000 H 05632000 AUTO
-S 4093000 V 02887000 AUTO
-S 4177000 H 04391000 AUTO
-S 4124000 H 03480000 AUTO
-S 4139000 V 02220000 AUTO
-S 3693000 V 04441000 AUTO
-S 4194000 H 06660000 AUTO
-S 3803000 H 27500000 AUTO
-S 4112000 V 02000000 AUTO
-S 3676000 H 05900000 AUTO
-S 3652000 H 04000000 AUTO
-S 3725000 H 26669000 AUTO
-S 3898000 V 04195000 AUTO
-S 4162000 H 07200000 AUTO
-S 4168000 H 02400000 AUTO
-S 3965000 H 03332000 AUTO
-S 4100000 H 06654000 AUTO
-S 4127000 H 03000000 AUTO
-S 4109000 H 06654000 AUTO
-S 3670000 H 02960000 AUTO
-S 3853000 H 05900000 AUTO
-S 3660000 V 02540000 AUTO
-S 4170000 H 02222000 AUTO
-S 3630000 H 05632000 AUTO
-S 3695000 V 02220000 AUTO
-S 4184000 H 06142000 AUTO
-S 4122000 V 01860000 AUTO
-S 4022000 V 03800000 AUTO
-S 4137000 H 04400000 AUTO
-S 3878000 V 22117000 AUTO
-S 4132000 V 02800000 AUTO
-S 4043000 V 07440000 AUTO
-S 4142000 H 02222000 AUTO
-S 3990000 V 04195000 AUTO
-S 3667000 V 03340000 AUTO
-S 3673000 V 03000000 AUTO
diff --git a/dvb-s/Nahuel-1-71.8W b/dvb-s/Nahuel-1-71.8W
deleted file mode 100644
index 82845bb2..00000000
--- a/dvb-s/Nahuel-1-71.8W
+++ /dev/null
@@ -1,11 +0,0 @@
-# Nahuel 1 @ 71.8W
-# freq pol sr fec
-
-S 11673000 V 04000000 AUTO
-S 11680000 V 03335000 AUTO
-S 11654000 V 04170000 AUTO
-S 11874000 V 04000000 AUTO
-S 12136000 V 02960000 AUTO
-S 11873000 H 08000000 AUTO
-S 12116000 H 14396000 AUTO
-S 11997000 V 08500000 AUTO
diff --git a/dvb-s/Nilesat101+102-7.0W b/dvb-s/Nilesat101+102-7.0W
deleted file mode 100644
index 8ef176f9..00000000
--- a/dvb-s/Nilesat101+102-7.0W
+++ /dev/null
@@ -1,41 +0,0 @@
-# Nilesat 101/102 & Atlantic Bird @ 7W
-# freq pol sr fec
-S 10719000 V 27500000 3/4
-S 10723000 H 27500000 3/4
-S 10758000 V 27500000 3/4
-S 10775000 H 27500000 3/4
-S 10796000 V 27500000 3/4
-S 10892000 H 27500000 3/4
-S 10911000 V 27500000 3/4
-S 10930000 H 27500000 3/4
-S 11317000 V 27500000 3/4
-S 11747000 V 27500000 3/4
-S 11766000 H 27500000 3/4
-S 11785000 V 27500000 3/4
-S 11804000 H 27500000 3/4
-S 11823000 V 27500000 3/4
-S 11843000 H 27500000 3/4
-S 11862000 V 27500000 3/4
-S 11881000 H 27500000 3/4
-S 11900000 V 27500000 3/4
-S 11919000 H 27500000 3/4
-S 11938000 V 27500000 3/4
-S 11958000 H 27500000 3/4
-S 11977000 V 27600000 5/6
-S 11996000 H 27500000 3/4
-S 12015000 V 27500000 3/4
-S 12034000 H 27500000 3/4
-S 12054000 V 27500000 3/4
-S 12073000 H 27500000 3/4
-S 12130000 V 27500000 3/4
-S 12149000 H 27500000 3/4
-S 12207000 V 27500000 3/4
-S 12226000 H 27500000 3/4
-S 12284000 V 27500000 3/4
-S 12303000 H 27500000 3/4
-S 12341000 V 27500000 3/4
-S 12360000 H 27500000 3/4
-S 12380000 V 27500000 3/4
-S 12399000 H 27500000 3/4
-S 12418000 V 27500000 3/4
-S 12476000 H 27500000 3/4
diff --git a/dvb-s/OptusC1-156E b/dvb-s/OptusC1-156E
deleted file mode 100644
index 0e3e73b2..00000000
--- a/dvb-s/OptusC1-156E
+++ /dev/null
@@ -1,20 +0,0 @@
-# Optus C1 satellite 156E
-# freq pol sr fec
-S 12278000 H 30000000 2/3
-S 12305000 H 30000000 2/3
-S 12358000 H 27000000 2/3
-S 12398000 H 27800000 3/4
-S 12407000 V 30000000 2/3
-S 12438000 H 27800000 3/4
-S 12487000 V 27800000 3/4
-S 12501000 H 29473000 3/4
-S 12518000 H 27800000 3/4
-S 12527000 V 30000000 3/4
-S 12558000 H 27800000 3/4
-S 12564000 H 29473000 3/4
-S 12567000 V 27800000 2/3
-S 12598000 H 27800000 3/4
-S 12607000 V 29473000 3/4
-S 12638000 H 27800000 3/4
-S 12689000 H 27800000 3/4
-S 12720000 V 30000000 3/4
diff --git a/dvb-s/OptusD1-160.0E b/dvb-s/OptusD1-160.0E
deleted file mode 100644
index b13437d0..00000000
--- a/dvb-s/OptusD1-160.0E
+++ /dev/null
@@ -1,4 +0,0 @@
-# Optus D1 satellite 160.0E
-# freq pol sr fec
-S 12456000 H 22500000 3/4
-S 12483000 H 22500000 3/4
diff --git a/dvb-s/PalapaC2_C-113.0E b/dvb-s/PalapaC2_C-113.0E
deleted file mode 100644
index d9b0fc8c..00000000
--- a/dvb-s/PalapaC2_C-113.0E
+++ /dev/null
@@ -1,39 +0,0 @@
-# Palapa C2 @ 113.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# SCTV Jawa Timur
-S 3745000 H 3125000 3/4
-
-# SCTV
-S 3758000 H 4470000 3/4
-
-# TVRI Nasional
-S 3765000 H 5555000 3/4
-
-# RCTI
-S 3774000 H 6520000 3/4
-
-# KBS World Indonesia
-S 3836000 V 2097000 3/4
-
-# Bali TV
-S 3926000 H 4208000 3/4
-
-# TV One Indonesia
-S 4054000 H 5632000 3/4
-
-# ANTV Indonesia
-S 4055000 V 6510000 3/4
-
-# Indosiar
-S 4074000 V 6500000 3/4
-
-# Satelindo Multiplex
-S 4080000 H 28125000 3/4
-
-# TPI Indonesia
-S 4184000 V 6700000 3/4
diff --git a/dvb-s/SBS6-74w b/dvb-s/SBS6-74w
deleted file mode 100644
index f99e3112..00000000
--- a/dvb-s/SBS6-74w
+++ /dev/null
@@ -1,4 +0,0 @@
-# SBS 6 @ 74W
-# freq pol sr fec
-
-S 11744000 H 06616000 AUTO
diff --git a/dvb-s/ST1_C-80.0E b/dvb-s/ST1_C-80.0E
deleted file mode 100644
index 92d5b809..00000000
--- a/dvb-s/ST1_C-80.0E
+++ /dev/null
@@ -1,27 +0,0 @@
-# ST1 @ 88.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# GTV Multiplex
-S 3469000 V 30000000 3/4
-
-# ABTV Multiplex
-S 3521000 H 8332000 5/6
-
-# Videoland Multiplex
-S 3550000 V 30000000 3/4
-
-# GTV Multiplex
-S 3595000 H 30000000 3/4
-
-# Videoland multiplex
-S 3632000 V 30000000 3/4
-
-# Chungwa Telecom
-S 3671000 H 9256000 3/4
-
-# NTD TV Asia-Pacific
-S 3689000 H 3000000 3/4
diff --git a/dvb-s/Satmex-5-116.8W b/dvb-s/Satmex-5-116.8W
deleted file mode 100644
index f0522bf2..00000000
--- a/dvb-s/Satmex-5-116.8W
+++ /dev/null
@@ -1,72 +0,0 @@
-# Satmex 5 @ 116.8W
-# freq pol sr fec
-
-S 12034000 H 02532000 AUTO
-S 12175000 H 04232000 AUTO
-S 4060000 H 19510000 AUTO
-S 3905000 V 02963000 AUTO
-S 4084000 H 03162000 AUTO
-S 3767000 H 01620000 AUTO
-S 11975000 H 05000000 AUTO
-S 11960000 H 02000000 AUTO
-S 4180000 H 19510000 AUTO
-S 4115000 H 03253000 AUTO
-S 3840000 V 29270000 AUTO
-S 4160000 V 29270000 AUTO
-S 3940000 H 28125000 AUTO
-S 4052000 V 04307000 AUTO
-S 12024000 H 03000000 AUTO
-S 4134000 H 03617000 AUTO
-S 12028000 H 03255000 AUTO
-S 12060000 V 03078000 AUTO
-S 4012000 V 03131000 AUTO
-S 3949000 V 03255000 AUTO
-S 4076000 H 02962000 AUTO
-S 3749000 H 04070000 AUTO
-S 3744000 H 04480000 AUTO
-S 3755000 H 04000000 AUTO
-S 3869000 H 03000000 AUTO
-S 3876000 H 02170000 AUTO
-S 3879000 H 01984000 AUTO
-S 3957000 V 02600000 AUTO
-S 3975000 V 03131000 AUTO
-S 3982000 H 02531000 AUTO
-S 3832000 H 02500000 AUTO
-S 3953000 V 02597000 AUTO
-S 3987000 V 08860000 AUTO
-S 3996000 V 02170000 AUTO
-S 3748000 V 02100000 AUTO
-S 3932000 V 02500000 AUTO
-S 3914000 V 03223000 AUTO
-S 3888000 H 05351000 AUTO
-S 3805000 V 04679000 AUTO
-S 4001000 V 04100000 AUTO
-S 4023000 H 06400000 AUTO
-S 12176000 H 03985000 AUTO
-S 4108000 H 02666000 AUTO
-S 4038000 V 07675000 AUTO
-S 3809000 V 03100000 AUTO
-S 4080000 V 29270000 AUTO
-S 3910000 H 02500000 AUTO
-S 4164000 H 01733000 AUTO
-S 12193000 V 07885000 AUTO
-S 12164000 V 02000000 AUTO
-S 12044000 V 04340000 AUTO
-S 3720000 V 27000000 AUTO
-S 3922000 V 09760000 AUTO
-S 3797000 V 03200000 AUTO
-S 3968000 V 07500000 AUTO
-S 4037000 H 02222000 AUTO
-S 4046000 H 02441000 AUTO
-S 4080000 H 02441000 AUTO
-S 3773000 V 02892000 AUTO
-S 3767000 V 02893000 AUTO
-S 3935000 V 04440000 AUTO
-S 3972000 H 03364000 AUTO
-S 3905000 H 02400000 AUTO
-S 4007000 V 05582000 AUTO
-S 3885000 H 03000000 AUTO
-S 3826000 H 02712000 AUTO
-S 3944000 V 03410000 AUTO
-S 3915000 H 01520000 AUTO
-S 3876000 V 02920000 AUTO
diff --git a/dvb-s/Satmex-6-113.0W b/dvb-s/Satmex-6-113.0W
deleted file mode 100644
index 8ff01b80..00000000
--- a/dvb-s/Satmex-6-113.0W
+++ /dev/null
@@ -1,19 +0,0 @@
-# Satmex 6 @ 113.0W
-# freq pol sr fec
-
-S 4078000 H 03609000 AUTO
-S 4080000 V 03255000 AUTO
-S 12145000 V 03255000 AUTO
-S 4085000 V 02821000 AUTO
-S 12126000 V 06022000 AUTO
-S 12166000 H 17500000 AUTO
-S 4075000 V 03782000 AUTO
-S 4091000 V 03720000 AUTO
-S 3985000 V 02300000 AUTO
-S 12126000 H 02170000 AUTO
-S 12157000 V 03038000 AUTO
-S 12091000 V 03337000 AUTO
-S 3947000 V 03700000 AUTO
-S 3761000 V 02120000 AUTO
-S 12107000 V 02222000 AUTO
-S 12080000 H 25635000 AUTO
diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E
index 949d0e24..ec4e4eaf 100644
--- a/dvb-s/Sirius-5.0E
+++ b/dvb-s/Sirius-5.0E
@@ -1,62 +1,5 @@
# Sirius 5.0E
# freq pol sr fec
-S 11215000 V 6666000 1/2
-S 11227000 H 23145000 3/4
-S 11247000 V 23145000 3/4
-S 11420000 H 23145000 3/4
-S 11727000 H 27500000 5/6
-S 11747000 V 27500000 3/4
-S 11766000 H 27500000 3/4
-S 11785000 V 27500000 3/4
-S 11804000 H 27500000 3/4
S 11823000 V 27500000 3/4
-S 11843000 H 27500000 3/4
-S 11862000 V 27500000 3/4
-S 11881000 H 27500000 3/4
-S 11900000 V 27500000 3/4
-S 11919000 H 27500000 3/4
-S 11938000 V 27500000 3/4
-S 11958000 H 27500000 3/4
S 11977000 V 27500000 3/4
-S 11996000 H 27500000 3/4
-S 12015000 V 27500000 5/6
-S 12034000 H 27500000 3/4
S 12054000 V 27500000 3/4
-S 12073000 H 27500000 3/4
-S 12092000 V 27500000 3/4
-S 12111000 H 27500000 5/6
-S 12130000 V 27500000 3/4
-S 12149000 H 27500000 3/4
-S 12169000 V 27500000 3/4
-S 12188000 H 27500000 7/8
-S 12207000 V 27500000 3/4
-S 12226000 H 25540000 7/8
-S 12245000 V 27500000 3/4
-S 12265000 H 27500000 3/4
-S 12284000 V 27500000 3/4
-S 12303000 H 25547000 7/8
-S 12322000 V 27500000 3/4
-S 12341000 H 27500000 3/4
-S 12360000 V 27500000 7/8
-S 12379000 H 27500000 3/4
-S 12399000 V 27500000 2/3
-S 12418000 H 27500000 3/4
-S 12437000 V 27500000 2/3
-S 12456000 H 27500000 3/4
-S 12476000 V 27500000 3/4
-S 12608000 H 27500000 3/4
-S 12637000 H 14465000 3/4
-S 12668000 V 6666000 1/2
-S 12672000 H 3300000 3/4
-S 12674000 V 10000000 3/4
-S 12678000 V 13333000 5/6
-S 12680000 H 9404000 3/4
-S 12685000 V 4444000 3/4
-S 12690000 H 3330000 3/4
-S 12693000 V 3333000 5/6
-S 12701000 H 6111000 3/4
-S 12715000 H 3330000 3/4
-S 12718000 V 23500000 3/4
-S 12724000 H 1772000 3/4
-S 12728000 V 19720000 3/4
-S 12737000 V 6150000 3/4
diff --git a/dvb-s/Telecom2-8.0W b/dvb-s/Telecom2-8.0W
index 5f48631e..91678b48 100644
--- a/dvb-s/Telecom2-8.0W
+++ b/dvb-s/Telecom2-8.0W
@@ -1,17 +1,4 @@
# Telecom2 8.0W
# freq pol sr fec
-S 10972000 V 27500000 3/4
-S 10974000 H 27500000 3/4
-S 11010000 H 27500000 3/4
-S 11011000 V 27500000 3/4
-S 11042000 H 7860000 3/4
-S 11053000 H 2850000 3/4
-S 11064000 H 12667000 3/4
-S 11387000 H 24740000 5/6
-S 11428000 H 27500000 3/4
-S 11500000 H 3460000 AUTO
-S 11554000 V 27500000 3/4
-S 11595000 V 27500000 3/4
-S 12545000 H 3038000 3/4
-S 12566000 V 27500000 3/4
-S 12649000 V 27500000 3/4
+S 11635000 H 6800000 5/6
+S 12687000 V 1879000 3/4
diff --git a/dvb-s/Telkom1_C-108.0E b/dvb-s/Telkom1_C-108.0E
deleted file mode 100644
index f60c246e..00000000
--- a/dvb-s/Telkom1_C-108.0E
+++ /dev/null
@@ -1,48 +0,0 @@
-# Telkom 1 @ 108.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Telkom Vision Multiplex
-S 3580000 H 28000000 3/4
-
-# Telkom Vision Multiplex
-S 3620000 H 28000000 3/4
-
-# Telkom Vision Multiplex
-S 3640000 V 28000000 3/4
-
-# TV Timor Leste
-S 3776000 H 4285000 3/4
-
-# TV Edukasi 1
-S 3785000 H 4000000 3/4
-
-# TVRI Kalbar
-S 3793000 H 3000000 3/4
-
-# TVRI Papua
-S 3797000 H 3900000 3/4
-
-# TV Edukasi 2
-S 3807000 H 4000000 3/4
-
-# Trans 7
-S 3990000 H 6000000 3/4
-
-# TVRI Aceh
-S 4015000 H 6000000 3/4
-
-# RCTI Jawa Timur
-S 4025000 H 3000000 3/4
-
-# Trans TV
-S 4084000 H 6000000 3/4
-
-# Papua TV
-S 4092000 H 3570000 3/4
-
-# JTV
-S 4097000 H 3125000 3/4
diff --git a/dvb-s/Telstar10_C-76.5E b/dvb-s/Telstar10_C-76.5E
deleted file mode 100644
index 36b04316..00000000
--- a/dvb-s/Telstar10_C-76.5E
+++ /dev/null
@@ -1,63 +0,0 @@
-# Telstar 10 @ 76.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# Racing International
-S 3646000 H 5064000 3/4
-
-# Image Channel
-S 3655000 H 3214000 3/4
-
-# Globe Cast Asia multiplex
-S 3680000 H 27500000 3/4
-
-# UBI World TV Multiplex
-S 3760000 H 28066000 2/3
-
-# UBI World TV Multiplex
-S 3780000 V 28066000 2/3
-
-# Ekushey TV
-S 3787000 H 4600000 2/3
-
-# Diganta TV
-S 3793000 H 4340000 3/4
-
-# RRSat Global Network Multiplex
-S 3840000 H 27500000 3/4
-
-# Channel 1
-S 4003000 H 4080000 3/4
-
-# Boishakhi TV
-S 4009000 H 4300000 3/4
-
-# TV Maldives
-S 4030000 V 6312000 1/2
-
-# Channel I
-S 4034000 H 4300000 3/4
-
-# Bangla Vision
-S 4049000 H 3600000 3/4
-
-# Kantipur TV
-S 4056000 H 3214000 3/4
-
-# BBC World Service Multiplex
-S 4073000 H 13020000 1/2
-
-# MNC Indonesia
-S 4105000 H 3125000 3/4
-
-# NDTV Arabia
-S 4137000 H 2893000 3/4
-
-# Islamic TV
-S 4146000 H 3600000 3/4
-
-# Bangladesh Multiplex
-S 4173000 H 7400000 3/4
diff --git a/dvb-s/Telstar12-15.0W b/dvb-s/Telstar12-15.0W
index db14a6ec..529b91f7 100644
--- a/dvb-s/Telstar12-15.0W
+++ b/dvb-s/Telstar12-15.0W
@@ -1,26 +1,4 @@
# Telstar 12 15.0W
# freq pol sr fec
-S 10988000 H 2893000 3/4
-S 10992000 H 2893000 3/4
-S 11060000 H 19279000 3/4
-S 11123000 V 19279000 3/4
-S 11124000 H 18386000 3/4
-S 11150000 H 18386000 3/4
-S 11150000 V 19279000 3/4
-S 11531000 H 3198000 7/8
-S 11566000 H 4284000 3/4
-S 11677000 V 2200000 1/2
-S 11709000 V 3195000 AUTO
-S 11806000 V 7596000 3/4
-S 11963000 H 14714000 3/4
-S 12082000 H 3935000 3/4
-S 12117000 H 4772000 AUTO
-S 12159000 H 7777000 2/3
-S 12166000 H 3503000 3/4
-S 12173000 H 3503000 3/4
-S 12524000 V 26470000 3/4
-S 12547000 H 11900000 2/3
-S 12589000 V 4503000 1/2
-S 12608000 H 19279000 2/3
-S 12615000 V 11939000 2/3
-S 12645000 H 3255000 3/4
+S 12041000 H 3256000 2/3
+S 12520000 V 8700000 1/2
diff --git a/dvb-s/Telstar18_C-138.0E b/dvb-s/Telstar18_C-138.0E
deleted file mode 100644
index 6bd70c6d..00000000
--- a/dvb-s/Telstar18_C-138.0E
+++ /dev/null
@@ -1,18 +0,0 @@
-# Telstar 18 @ 138.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# I-Sky-Net Multiplex
-S 3599000 V 30000000 3/4
-
-# I-Sky-Net Multiplex
-S 3660000 V 30000000 3/4
-
-# LNTV Laos
-S 3704000 V 3034000 3/4
-
-# BBC World Service Multiplex
-S 4124000 V 3255000 1/2
diff --git a/dvb-s/Thaicom1A_C-120.0E b/dvb-s/Thaicom1A_C-120.0E
deleted file mode 100644
index 1a9d11fc..00000000
--- a/dvb-s/Thaicom1A_C-120.0E
+++ /dev/null
@@ -1,24 +0,0 @@
-# Thaicom 1A @ 120.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# TV3 Cambodia
-S 3725000 V 3255000 3/4
-
-# Panyapiwat
-S 3745000 V 2850000 5/6
-
-# CTN Cambodia Multiplex
-S 3854000 V 9628000 3/4
-
-# Kasikorn TV
-S 3881000 V 2000000 3/4
-
-# Bayon TV
-S 3916000 V 3359000 3/4
-
-# Radio Thailand Multiplex
-S 4135000 V 1808000 3/4
diff --git a/dvb-s/Thaicom2_C-78.5E b/dvb-s/Thaicom2_C-78.5E
deleted file mode 100644
index 4e1fbcdb..00000000
--- a/dvb-s/Thaicom2_C-78.5E
+++ /dev/null
@@ -1,33 +0,0 @@
-# Thaicom 2 @ 78.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# BBTV Channel 7
-S 3764000 H 5900000 3/4
-
-# SBT TV
-S 3803000 H 1445000 7/8
-
-# MCOT Multiplex
-S 3888000 H 15625000 3/4
-
-# Royal Thai Army TV 5
-S 3905000 H 6250000 3/4
-
-# Thai TV Color Channel 3
-S 3967000 H 4551000 3/4
-
-# RU TV 1
-S 4003000 H 1085000 3/4
-
-# Ten TV & Rich Channel
-S 4016000 H 2305000 7/8
-
-# NBT TV
-S 4106000 H 4688000 3/4
-
-# Thai PBS
-S 4145000 H 4815000 3/4
diff --git a/dvb-s/Thaicom5_C-78.5E b/dvb-s/Thaicom5_C-78.5E
deleted file mode 100644
index 902ddaca..00000000
--- a/dvb-s/Thaicom5_C-78.5E
+++ /dev/null
@@ -1,69 +0,0 @@
-# Thaicom 5 @ 78.5E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# ETC India Multiplex
-S 3421000 V 6667000 3/4
-
-# Europe Media Port Multiplex
-S 3431000 H 13333000 3/4
-
-# Nepal TV Multiplex
-S 3432000 V 6667000 3/4
-
-# CTV9
-S 3448000 V 2222000 3/4
-
-# RRSat Global Network (MPEG-4 S/2)
-S 3450000 H 13333000 3/4
-
-# Avenues TV
-S 3454000 V 3333000 3/4
-
-# PSI Channel
-S 3460000 V 1538000 3/4
-
-# Sagarmatha TV
-S 3489000 V 3333000 3/4
-
-# Dhi TV
-S 3502000 V 4444000 2/3
-
-# Korean Central TV
-S 3504000 H 3367000 2/3
-
-# Gang Cartoon Channel
-S 3505000 V 1852000 3/4
-
-# Lao Star Channel
-S 3521000 V 2917000 3/4
-
-# Thaicom Multiplex
-S 3545000 V 30000000 5/6
-
-# RRSat Global Network
-S 3551000 H 13333000 3/4
-
-# VTV Maldives
-S 3562000 H 4444000 1/2
-
-# MRTV Multiplex
-S 3574000 H 7492000 2/3
-
-# Thaicom Multiplex
-S 3585000 V 26667000 3/4
-
-# Thaicom Multiplex
-S 3600000 H 26667000 3/4
-
-# MRTV Multiplex
-S 3617000 V 12500000 3/4
-
-# RRSat Global Network Multiplex
-S 3640000 H 28066000 3/4
-
-# TVK Cambodia
-S 3664000 H 3704000 3/4
diff --git a/dvb-s/Thor-1.0W b/dvb-s/Thor-1.0W
index b271e369..1f8f1d2d 100644
--- a/dvb-s/Thor-1.0W
+++ b/dvb-s/Thor-1.0W
@@ -1,65 +1,8 @@
# Thor 1.0W
# freq pol sr fec
-S 10747000 H 25000000 3/4
-S 10778000 V 25000000 3/4
-S 10778000 H 24500000 7/8
-S 10809000 V 24500000 7/8
-S 10809000 H 24500000 7/8
-S 10841000 V 24500000 7/8
-S 10841000 H 24500000 7/8
-S 10872000 V 24500000 7/8
-S 10872000 H 24500000 7/8
-S 10903000 V 25000000 3/4
-S 10903000 H 25000000 3/4
-S 10934000 V 24500000 7/8
-S 10934000 H 25000000 3/4
-S 11216000 V 24500000 7/8
-S 11229000 H 24500000 7/8
S 11247000 V 24500000 7/8
-S 11261000 H 24500000 7/8
-S 11278000 V 24500000 7/8
S 11293000 H 24500000 7/8
-S 11309000 V 24500000 7/8
S 11325000 H 24500000 7/8
-S 11325000 V 24500000 7/8
-S 11325000 V 24500000 7/8
-S 11341000 V 24500000 7/8
-S 11357000 H 24500000 7/8
-S 11372000 V 24500000 7/8
-S 11389000 H 24500000 7/8
-S 11403000 V 24500000 7/8
-S 11421000 H 24500000 7/8
-S 11434000 V 24500000 7/8
-S 11727000 V 28000000 7/8
-S 11747000 H 28000000 5/6
-S 11766000 V 28000000 7/8
-S 11785000 H 30000000 3/4
-S 11804000 V 28000000 7/8
-S 11823000 H 28000000 7/8
-S 11843000 V 30000000 3/4
-S 11862000 H 28000000 7/8
-S 11881000 V 28000000 5/6
-S 11900000 H 28000000 5/6
-S 11919000 V 28000000 7/8
-S 11938000 H 25000000 3/4
-S 11958000 V 28000000 7/8
-S 11977000 H 28000000 7/8
-S 11996000 V 28000000 7/8
-S 12015000 H 30000000 3/4
-S 12034000 V 28000000 7/8
-S 12073000 V 28000000 7/8
-S 12092000 H 30000000 3/4
-S 12130000 H 30000000 3/4
-S 12149000 V 28000000 5/6
+S 12054000 H 28000000 7/8
S 12169000 H 28000000 7/8
-S 12188000 V 25000000 3/4
-S 12226000 V 28000000 3/4
-S 12245000 H 28000000 5/6
-S 12303000 V 28000000 5/6
-S 12322000 H 27800000 3/4
-S 12341000 V 28000000 7/8
-S 12380000 V 28000000 5/6
-S 12399000 H 28000000 7/8
-S 12418000 V 28000000 7/8
-S 12456000 V 28000000 3/4
-S 12476000 H 28000000 5/6
+S 12226000 V 28000000 7/8
diff --git a/dvb-s/Turksat-42.0E b/dvb-s/Turksat-42.0E
index a30d24f7..1ac7fd81 100644
--- a/dvb-s/Turksat-42.0E
+++ b/dvb-s/Turksat-42.0E
@@ -1,104 +1,4 @@
# Turksat 42.0E
# freq pol sr fec
-S 10968000 V 4557000 3/4
-S 10970000 H 30000000 5/6
-S 10999000 V 2222000 3/4
-S 11003000 V 2175000 3/4
-S 11007000 V 2950000 5/6
-S 11011000 V 2125000 5/6
-S 11014000 V 2050000 3/4
-S 11018000 V 2150000 3/4
-S 11028000 V 2400000 3/4
-S 11083000 V 8888000 3/4
-S 11136000 V 2170000 3/4
-S 11143000 V 2200000 3/4
-S 11159000 V 2596000 3/4
-S 11162000 V 2222000 5/6
-S 11166000 V 2960000 3/4
-S 11177000 V 2200000 3/4
-S 11554000 H 2916000 2/3
-S 11576000 H 2400000 5/6
-S 11581000 H 4444000 3/4
-S 11607000 H 3750000 2/3
-S 11712000 V 2963000 3/4
-S 11716000 V 2222000 3/4
-S 11729000 V 15555000 5/6
-S 11734000 H 3291000 3/4
-S 11739000 H 3125000 3/4
-S 11743000 H 2222000 3/4
-S 11743000 V 2222000 3/4
-S 11748000 H 4444000 5/6
-S 11753000 H 3000000 7/8
-S 11754000 V 3900000 5/6
-S 11758000 V 2962000 3/4
-S 11760000 H 5925000 3/4
-S 11762000 V 2155000 3/4
-S 11765000 V 2222000 3/4
-S 11770000 V 2177000 3/4
-S 11773000 V 2420000 5/6
-S 11775000 H 2222000 3/4
-S 11777000 V 3150000 5/6
-S 11781000 V 2815000 5/6
-S 11794000 H 5632000 3/4
-S 11800000 H 2400000 5/6
-S 11804000 V 24444000 5/6
-S 11830000 V 6666000 3/4
-S 11839000 V 4444000 3/4
-S 11846000 V 3333000 5/6
-S 11852000 V 4444000 5/6
-S 11858000 V 2400000 7/8
-S 11867000 V 4444000 5/6
-S 11874000 V 3400000 7/8
-S 11878000 V 3750000 5/6
-S 11882000 V 2965000 5/6
-S 11887000 V 3333000 7/8
-S 11892000 H 12800000 5/6
-S 11892000 V 2960000 5/6
-S 11896000 V 2222000 3/4
-S 11905000 H 6666000 3/4
-S 11912000 H 3333000 5/6
-S 11919000 V 24444000 3/4
-S 11951000 V 8800000 5/6
-S 11959000 V 2960000 3/4
-S 11963000 V 2300000 5/6
-S 11967000 V 4340000 3/4
-S 11970000 H 17900000 5/6
-S 11973000 V 2240000 5/6
-S 11984000 H 4000000 5/6
-S 11996000 V 26000000 5/6
-S 12002000 H 4800000 5/6
-S 12008000 H 4400000 5/6
-S 12015000 H 4800000 5/6
-S 12022000 H 5380000 5/6
-S 12028000 H 4557000 5/6
-S 12126000 V 6666000 5/6
-S 12127000 H 7400000 5/6
-S 12140000 H 2222000 3/4
-S 12140000 V 4444000 3/4
-S 12513000 H 4400000 3/4
-S 12518000 H 3125000 3/4
-S 12524000 H 4250000 5/6
-S 12530000 H 4444000 5/6
-S 12536000 H 2962000 3/4
-S 12540000 H 3125000 3/4
-S 12563000 H 24000000 7/8
-S 12590000 V 3000000 5/6
-S 12595000 V 2500000 5/6
-S 12605000 V 2961000 3/4
-S 12609000 V 3700000 5/6
-S 12614000 V 3333000 5/6
-S 12633000 V 4800000 5/6
-S 12636000 H 4800000 5/6
-S 12638000 V 2400000 5/6
-S 12647000 V 3333000 5/6
-S 12652000 H 22500000 5/6
-S 12652000 V 3900000 5/6
-S 12660000 V 9150000 5/6
-S 12672000 H 2222000 5/6
-S 12680000 H 8888000 3/4
-S 12692000 H 2800000 5/6
-S 12696000 H 2222000 3/4
-S 12699000 H 2400000 3/4
-S 12702000 H 2285000 7/8
-S 12717000 V 5925000 5/6
-S 12731000 V 3333000 3/4
+S 11594000 H 4557000 5/6
+S 10978000 V 2344000 3/4
diff --git a/dvb-s/Vinasat1_C-132.0E b/dvb-s/Vinasat1_C-132.0E
deleted file mode 100644
index 4d611dea..00000000
--- a/dvb-s/Vinasat1_C-132.0E
+++ /dev/null
@@ -1,12 +0,0 @@
-# VINASAT 1 @ 132.0E C-BAND
-# Generated by Pietro Casoar
-# 1st March 2009
-
-# MPEG-2 & MPEG-4 QPSK (DVBS/S2)
-# freq pol sr fec
-
-# VTV Multiplex (VTV 1, VTV 2, VTV 3, VTV 4, VTV6)
-S 3413000 V 9766000 3/4
-
-# VOV TV (Voice of VietNam)
-S 3529000 V 2500000 2/3
diff --git a/dvb-s/Yamal201-90.0E b/dvb-s/Yamal201-90.0E
deleted file mode 100644
index d0817c5a..00000000
--- a/dvb-s/Yamal201-90.0E
+++ /dev/null
@@ -1,48 +0,0 @@
-# Yamal201 @ 90E
-# freq pol sr fec
-S 10990000 V 2170000 AUTO
-S 10995000 V 4285000 AUTO
-S 11057000 V 26470000 AUTO
-S 11092000 V 26470000 AUTO
-S 11145000 V 22222000 AUTO
-S 11671000 V 18200000 AUTO
-
-# Yamal201 @ 90E C-BAND
-# Generated by Roman Kashcheev
-# Mar 30, 2008
-# freq pol sr fec
-
-# NauTV
-S 3536000 H 2532000 3/4
-# Turkmenistan
-S 3553000 H 20000000 3/4
-# CNL
-S 3577000 H 2626000 3/4
-# Nord TV
-S 3588000 H 4285000 3/4
-# Telekompanija OTV
-S 3600000 H 4285000 3/4
-# Oblastnoe Televidenie
-S 3603000 V 4285000 3/4
-# CNL
-S 3605000 H 2626000 3/4
-# Gascom
-S 3645000 H 28000000 3/4
-# Spas
-S 3674000 H 17500000 3/4
-# TV Gubernia
-S 3725000 H 3200000 3/4
-# Yuzhniy Region
-S 3900000 H 4285000 3/4
-# Rostov TV
-S 3907000 H 4265000 3/4
-# ORTRK 12 Kanal
-S 3912000 H 4295000 3/4
-# O2
-S 3944000 H 15550000 3/4
-# Klub Puteshestviy
-S 3980000 H 38000000 3/4
-# Music Box
-S 4042000 V 8681000 3/4
-# NetService
-S 4084000 V 2500000 3/4
diff --git a/dvb-t/ad-Andorra b/dvb-t/ad-Andorra
deleted file mode 100644
index 7c63c828..00000000
--- a/dvb-t/ad-Andorra
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Andorra
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/at-Official b/dvb-t/at-Official
deleted file mode 100644
index cdb221c7..00000000
--- a/dvb-t/at-Official
+++ /dev/null
@@ -1,24 +0,0 @@
-# Austria, all DVB-T transmitters run by ORS
-# Created from http://www.ors.at/view08/ors.php?mid=94
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 490000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 546000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/au-Adelaide b/dvb-t/au-Adelaide
deleted file mode 100644
index 923e7012..00000000
--- a/dvb-t/au-Adelaide
+++ /dev/null
@@ -1,14 +0,0 @@
-# Australia / Adelaide / Mt Lofty
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# 3D Trial Australia
-T 536625000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-t/au-AdelaideFoothills b/dvb-t/au-AdelaideFoothills
deleted file mode 100644
index 466a354e..00000000
--- a/dvb-t/au-AdelaideFoothills
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Adelaide / Grenfell Street
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 781625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 795500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 760500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Ballarat b/dvb-t/au-Ballarat
deleted file mode 100644
index c6c2a542..00000000
--- a/dvb-t/au-Ballarat
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Ballarat
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 620625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN
-T 592625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# SC
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 634625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Bendigo b/dvb-t/au-Bendigo
deleted file mode 100644
index a5df229e..00000000
--- a/dvb-t/au-Bendigo
+++ /dev/null
@@ -1,41 +0,0 @@
-# Australia / Bendigo (Mt Alexandria transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 669500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 572500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Seven
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 555250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Nine
-T 576250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Ten
-T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# SBS
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 534250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-
-# UNK1
-T 676500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# UNK2
-T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 585625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 536500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 529500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 536625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Brisbane b/dvb-t/au-Brisbane
deleted file mode 100644
index 67d9290d..00000000
--- a/dvb-t/au-Brisbane
+++ /dev/null
@@ -1,14 +0,0 @@
-# Australia / Brisbane (Mt Coot-tha transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# 31 Digital
-T 599500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Cairns b/dvb-t/au-Cairns
deleted file mode 100644
index 430045d8..00000000
--- a/dvb-t/au-Cairns
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Cairns (Mt Bellenden-Ker transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC VHF 8
-T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SEVEN VHF 11
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN VHF 12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# TEN VHF 6 (Expected Start Date Dec 2006)
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF 29
-T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Canberra-Black-Mt b/dvb-t/au-Canberra-Black-Mt
deleted file mode 100644
index bdaa33c1..00000000
--- a/dvb-t/au-Canberra-Black-Mt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Canberra / Black Mt
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Coonabarabran b/dvb-t/au-Coonabarabran
deleted file mode 100644
index 8596ba58..00000000
--- a/dvb-t/au-Coonabarabran
+++ /dev/null
@@ -1,16 +0,0 @@
-# Australia / Coonabarabran
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# ABC VHF12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# TEN UHF46
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine UHF45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven VHF11
-#T 618250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF44
-T 641500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# D44 UHF35
-#T 578500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/au-Darwin b/dvb-t/au-Darwin
index 236d0495..522bb1dd 100644
--- a/dvb-t/au-Darwin
+++ b/dvb-t/au-Darwin
@@ -1,9 +1,5 @@
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC (UHF 30)
T 543625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine (UHF 31)
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS (UHF 29)
+T 550500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Southern Cross (UHF 32)
-T 557625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 557625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Devonport b/dvb-t/au-Devonport
deleted file mode 100644
index 4985f099..00000000
--- a/dvb-t/au-Devonport
+++ /dev/null
@@ -1,19 +0,0 @@
-# Australia / Tasmania / Devonport
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# Brett S Hallett October 2009 , may not be complete !!
-#
-# ABC VHF 57
-T 730250000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# ABC Digital 45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS VHF 54
-T 709250000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# SBS Digital 39
-T 606500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# SCTV
-T 613498000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN
-T 627498000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# TDT
-T 585498000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-FraserCoast-Bundaberg b/dvb-t/au-FraserCoast-Bundaberg
deleted file mode 100644
index 562fc34a..00000000
--- a/dvb-t/au-FraserCoast-Bundaberg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / QLD / Fraser Coast - Bundaberg / Mt Goonaneman
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC VHF9A
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF28
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Seven VHF7
-T 184625000 7MHz 2/3 NONE QAM64 8k 1/16 NONE
-# WIN Wide Bay VHF10
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Southern Cross Ten VHF9
-T 198525000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-GoldCoast b/dvb-t/au-GoldCoast
deleted file mode 100644
index 64b39691..00000000
--- a/dvb-t/au-GoldCoast
+++ /dev/null
@@ -1,21 +0,0 @@
-# DVB-T frequencies & modulation for the Gold Coast, Australia (Mt Tamborine)
-# See http://www.dba.org.au/index.asp?sectionID=22&recLocation=Gold+Coast
-# and http://www.dba.org.au/index.asp?sectionID=120
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC (UHF 62)
-T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS (UHF 36)
-T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Seven (UHF 53)
-T 704500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# NBN (UHF 68)
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime (UHF 65)
-T 788500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Southern Cross Ten (UHF 43)
-T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine (UHF 59)
-T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten (UHF 56)
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Goulburn-Rocky_Hill b/dvb-t/au-Goulburn-Rocky_Hill
deleted file mode 100644
index bff0dbee..00000000
--- a/dvb-t/au-Goulburn-Rocky_Hill
+++ /dev/null
@@ -1,19 +0,0 @@
-# Australia / Goulburn / Rocky Hill
-#
-# Scanned 17/10/2009 - Alex Ferrara (alex@receptiveit.com.au)
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC - netid (4112) tid (547) offset (+125Khz)
-T 725625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# SBS - netid (12802) tid (848) offset (+125Khz)
-T 746625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-
-# WIN - netid (12915) tid (12922) offset (+125Khz)
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Prime - netid (12929) tid (2462) offset (+125Khz)
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# TEN - netid (12812) tid (2055) offset (0Khz)
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Hervey_Bay-Ghost_Hill b/dvb-t/au-Hervey_Bay-Ghost_Hill
deleted file mode 100644
index 04dee513..00000000
--- a/dvb-t/au-Hervey_Bay-Ghost_Hill
+++ /dev/null
@@ -1,16 +0,0 @@
-# Australia / Hervey Bay / Ghost Hill
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# ABC UHF56
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven UHF59
-T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine UHF62
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten UHF68
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF28
-T 529500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# SBS UHF34
-T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Hobart b/dvb-t/au-Hobart
deleted file mode 100644
index b2b60e85..00000000
--- a/dvb-t/au-Hobart
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Tasmania / Hobart
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC VHF 8
-T 191500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS VHF 9a
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# SCT VHF 10
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN VHF 7
-T 184625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# TDT VHF 11
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Mackay b/dvb-t/au-Mackay
deleted file mode 100644
index e7fbfc0c..00000000
--- a/dvb-t/au-Mackay
+++ /dev/null
@@ -1,14 +0,0 @@
-# Australia / Mackay (Mt Blackwood transmitters)
-# aufreq=((UHF channel number)*8+306)
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 212500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven Network
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# WIN Digital
-T 578500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Southern Cross Ten
-T 557500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Melbourne-Upwey b/dvb-t/au-Melbourne-Upwey
deleted file mode 100644
index 21718453..00000000
--- a/dvb-t/au-Melbourne-Upwey
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Melbourne (Upwey Repeater)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 683500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-MidNorthCoast b/dvb-t/au-MidNorthCoast
deleted file mode 100644
index baf3ba58..00000000
--- a/dvb-t/au-MidNorthCoast
+++ /dev/null
@@ -1,22 +0,0 @@
-# Australia ABC Mid North Coast
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC middle brother
-T 184625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime Middle Brother
-T 198500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# NBN Middle Brother
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten Middle Brother
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS middle brother
-T 205500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# ABC Moombil
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime Moombil
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# NBN Moombil
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten Moombil
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS Moombil
-T 606500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Newcastle b/dvb-t/au-Newcastle
deleted file mode 100644
index 8fc45521..00000000
--- a/dvb-t/au-Newcastle
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Newcastle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 599500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# NBN
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 704500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# ABC
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SC10
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Perth b/dvb-t/au-Perth
deleted file mode 100644
index 48c046f1..00000000
--- a/dvb-t/au-Perth
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Perth
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven Network
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine Network
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Network TEN
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Perth_Roleystone b/dvb-t/au-Perth_Roleystone
deleted file mode 100644
index 496a750c..00000000
--- a/dvb-t/au-Perth_Roleystone
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Perth (Roleystone transmitter)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# ABC
-T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 746500000 7MHz 2/3 NONE QAM64 8k 1/16 NONE
-# Nine
-T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 788500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-SpencerGulf b/dvb-t/au-SpencerGulf
deleted file mode 100644
index 474d66ac..00000000
--- a/dvb-t/au-SpencerGulf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Australia / South Australia / Pt Pirie (THE BLUFF)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Southern Cross
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 620500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-SunshineCoast b/dvb-t/au-SunshineCoast
deleted file mode 100644
index c376678f..00000000
--- a/dvb-t/au-SunshineCoast
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Sunshine Coast
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS36 SBS ***
-T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# TNQ47 10 ***
-T 662625000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
-# ABQ62 ABC ***
-T 767625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# STQ65 7 ***
-T 788625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# STQ68 WIN ***
-T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Sutherland b/dvb-t/au-Sutherland
deleted file mode 100644
index 6c21a73a..00000000
--- a/dvb-t/au-Sutherland
+++ /dev/null
@@ -1,20 +0,0 @@
-# Australia / Sutherland
-#
-# Australia modulation params:
-# - http://www.dba.org.au/index.asp?sectionID=120
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# North (Broadcast Site Escarpment Road BROKERS NOSE)
-# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
-#
-#Channel 7 stations
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-#Channel 9 bundle
-# T 191500000 7MHz AUTO AUTO AUTO AUTO AUTO AUTO
-#One and Channel 10
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-#Aunty
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-#SBS
-T 571500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Sydney_Kings_Cross b/dvb-t/au-Sydney_Kings_Cross
deleted file mode 100644
index ef77870e..00000000
--- a/dvb-t/au-Sydney_Kings_Cross
+++ /dev/null
@@ -1,14 +0,0 @@
-# Australia / Sydney / Kings Cross and North Head
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# ABC UHF30
-T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven UHF48
-T 669500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine UHF33
-T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten UHF45
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF34
-T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Sydney_North_Shore b/dvb-t/au-Sydney_North_Shore
deleted file mode 100644
index ed362334..00000000
--- a/dvb-t/au-Sydney_North_Shore
+++ /dev/null
@@ -1,16 +0,0 @@
-# Australia / Sydney / North Shore (aka Artarmon/Gore Hill/Willoughby)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# ABC VHF12
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven VHF6
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine VHF8
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten VHF11
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF34
-T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# D44 UHF35
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/au-Tamworth b/dvb-t/au-Tamworth
deleted file mode 100644
index 8d28c426..00000000
--- a/dvb-t/au-Tamworth
+++ /dev/null
@@ -1,38 +0,0 @@
-# Australia / NSW / New England / Tamworth / Mt.Soma
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 690500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# NBN
-T 753500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 732500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# ABC
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SC10
-T 774500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Australia / NSW / New England / Upper Namoi / Mt.Dowe
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# NBN
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# ABC
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SC10
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# Australia / NSW / Western Districts / Central Western Slopes / Mt. Cenn Cruaich
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 641500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# WIN
-T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# ABC
-T 226625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SC10
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Townsville b/dvb-t/au-Townsville
deleted file mode 100644
index e411cd4e..00000000
--- a/dvb-t/au-Townsville
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Brisbane (Mt Coot-tha transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# SBS
-T 592500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# ABC
-T 550500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-WaggaWagga b/dvb-t/au-WaggaWagga
deleted file mode 100644
index cc38f883..00000000
--- a/dvb-t/au-WaggaWagga
+++ /dev/null
@@ -1,12 +0,0 @@
-# Australia / Wagga Wagga (Mt Ulundra)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 669500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Prime
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Southern Cross Ten
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN
-T 683500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/au-Wollongong b/dvb-t/au-Wollongong
deleted file mode 100644
index 6fbf7bff..00000000
--- a/dvb-t/au-Wollongong
+++ /dev/null
@@ -1,40 +0,0 @@
-# Australia / Wollongong
-#
-# Australia modulation params:
-# - http://www.dba.org.au/index.asp?sectionID=120
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# North (Broadcast Site Escarpment Road BROKERS NOSE)
-# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+North
-#
-# ABC UHF52
-T 697500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime UHF46
-T 655500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN UHF40
-T 613500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten UHF43
-T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS UHF54
-T 711625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-#
-# Illawarra (Broadcast Australia Digital Television Tower KNIGHTS HILL)
-# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+Illawarra
-#
-# ABC UHF51
-T 690500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Prime UHF38
-T 599500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# WIN UHF36
-T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten UHF37
-T 592500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS - same as North
-#
-# Stanwell Park (Bald Hill STANWELL TOPS)
-# - http://www.dba.org.au/index.asp?query=true&sectionID=22&recLocation=Wollongong+%2D+Stanwell%20Park
-#
-# ABC, Prime, WIN, Ten are identical to Wollongong / North
-# SBS UHF49
-T 676500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-canberra b/dvb-t/au-canberra
index 792844df..5e71b074 100644
--- a/dvb-t/au-canberra
+++ b/dvb-t/au-canberra
@@ -1,12 +1,12 @@
# Australia / Canberra / Woden
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
-T 205625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 205625000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/8 NONE
+T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
# Nine
T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 219500000 7MHz 3/4 1/2 QAM64 8k 1/16 NONE
# SBS
T 543500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/au-Melbourne b/dvb-t/au-sydney_north_shore
index 6fefbea9..0bb6dd40 100644
--- a/dvb-t/au-Melbourne
+++ b/dvb-t/au-sydney_north_shore
@@ -1,12 +1,12 @@
-# Australia / Melbourne (Mt Dandenong transmitters)
+# Australia / Sydney / North Shore (aka Artarmon/Gore Hill)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
# ABC
T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
# Nine
T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# Ten
T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
# SBS
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/auto-Australia b/dvb-t/auto-Australia
deleted file mode 100644
index 393ac7f4..00000000
--- a/dvb-t/auto-Australia
+++ /dev/null
@@ -1,110 +0,0 @@
-# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
-# print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# print "T ", $freq + 125000, " 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-# for ($freq = 529500000; $freq <= 816500000; $freq += 7000000) {
-# print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# print "T ", $freq + 125000, " 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 177625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 536500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 536625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 543500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 543625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 550500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 550625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 564500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 564625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 571500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 571625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 592500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 592625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 606500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 606625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 613500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 613625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 620500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 620625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 627500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 627625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 648500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 648625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 655500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 655625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 662500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 662625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 669500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 669625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 676500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 676625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 683500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 683625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 704500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 704625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 711500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 711625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 718500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 718625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 725500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 725625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 732500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 732625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 739500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 739625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 760500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 760625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 767500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 767625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 774500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 774625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 781500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 781625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 788500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 788625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 795500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 795625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 816500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 816625000 7MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/dvb-t/auto-Default b/dvb-t/auto-Default
deleted file mode 100644
index 5aedde93..00000000
--- a/dvb-t/auto-Default
+++ /dev/null
@@ -1,65 +0,0 @@
-# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
-# print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
-# print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/dvb-t/auto-Italy b/dvb-t/auto-Italy
deleted file mode 100644
index 160bf736..00000000
--- a/dvb-t/auto-Italy
+++ /dev/null
@@ -1,72 +0,0 @@
-# for $freq (177500000, 186000000, 194500000, 203500000, 212500000, 219500000, 226500000) {
-# print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
-# print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 177500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 186000000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 186000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 194500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 194500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 203500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 203500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/dvb-t/auto-Taiwan b/dvb-t/auto-Taiwan
deleted file mode 100644
index c32af48a..00000000
--- a/dvb-t/auto-Taiwan
+++ /dev/null
@@ -1,18 +0,0 @@
-# for ($freq = 527000000; $freq <= 599000000; $freq += 6000000) {
-# print "T $freq 6MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 527000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 533000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 539000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 545000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 551000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 557000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 563000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 569000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 575000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 581000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 587000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 593000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
-T 599000000 6MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/dvb-t/auto-With167kHzOffsets b/dvb-t/auto-With167kHzOffsets
deleted file mode 100644
index 5dfbd2ee..00000000
--- a/dvb-t/auto-With167kHzOffsets
+++ /dev/null
@@ -1,165 +0,0 @@
-# for ($freq = 177500000; $freq <= 226500000; $freq += 7000000) {
-# print "T $freq 7MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-# for ($freq = 474000000; $freq <= 858000000; $freq += 8000000) {
-# print "T $freq 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# print "T ", $freq - 167000, " 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# print "T ", $freq + 167000, " 8MHz AUTO NONE AUTO AUTO AUTO NONE\n";
-# }
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 177500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 184500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 191500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 198500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 205500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 212500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 219500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 226500000 7MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 473833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 474167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 481833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 482167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 489833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 490167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 497833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 498167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 505833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 506167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 513833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 514167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 521833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 522167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 529833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 530167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 537833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 538167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 545833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 546167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 553833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 554167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 561833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 562167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 569833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 570167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 577833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 578167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 585833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 586167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 593833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 594167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 601833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 602167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 609833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 610167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 617833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 618167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 625833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 626167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 633833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 634167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 641833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 642167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 649833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 650167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 657833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 658167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 665833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 666167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 673833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 674167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 681833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 682167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 689833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 690167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 697833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 698167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 705833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 706167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 713833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 714167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 721833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 722167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 729833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 730167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 737833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 738167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 745833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 746167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 753833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 754167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 761833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 762167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 769833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 770167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 777833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 778167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 785833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 786167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 793833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 794167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 801833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 802167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 809833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 810167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 817833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 818167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 825833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 826167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 833833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 834167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 841833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 842167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 849833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 850167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858000000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 857833000 8MHz AUTO NONE AUTO AUTO AUTO NONE
-T 858167000 8MHz AUTO NONE AUTO AUTO AUTO NONE
diff --git a/dvb-t/ax-Smedsbole b/dvb-t/ax-Smedsbole
deleted file mode 100644
index fa9bc03b..00000000
--- a/dvb-t/ax-Smedsbole
+++ /dev/null
@@ -1,13 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20090808 2 0 OFDM FI </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Åland Smedsböle/Sund
-# date (yyyy-mm-dd) : 2009-12-23
-# provided by (opt) : k.hampf@gmail.com
-#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Ã…land Network
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Ã…land Network
diff --git a/dvb-t/be-All b/dvb-t/be-All
deleted file mode 100644
index 3d9f9135..00000000
--- a/dvb-t/be-All
+++ /dev/null
@@ -1,8 +0,0 @@
-# Belgium, whole country
-# Created from http://nl.wikipedia.org/wiki/DVB-T-frequenties
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
-T 834000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/ch-All b/dvb-t/ch-All
deleted file mode 100644
index 2e2e2738..00000000
--- a/dvb-t/ch-All
+++ /dev/null
@@ -1,32 +0,0 @@
-# Switzerland, whole country
-# Created from http://www.broadcast.ch/portal.aspx?pid=705
-# and http://www.broadcast.ch/data_program_dvbt.aspx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 522000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 554000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 562000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 602000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 618000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 626000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 642000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
-T 666000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 674000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 682000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 690000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 698000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
-T 714000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 722000000 8MHz 5/6 NONE QAM16 8k 1/8 NONE
-T 738000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 754000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 762000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 786000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 802000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 826000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 850000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/ch-Citycable b/dvb-t/ch-Citycable
deleted file mode 100644
index 1b9ed6c0..00000000
--- a/dvb-t/ch-Citycable
+++ /dev/null
@@ -1,18 +0,0 @@
-# Lausanne - Switzerland (DVB-T on CityCable cable network)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 522000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 554000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 570000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 578000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 586000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 610000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 618000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 626000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 730000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 746000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 818000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 826000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 834000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
-T 842000000 8MHz 7/8 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/ch-Geneva b/dvb-t/ch-Geneva
deleted file mode 100644
index 7ad0ae41..00000000
--- a/dvb-t/ch-Geneva
+++ /dev/null
@@ -1,16 +0,0 @@
-# Switzerland, Geneva region
-# Updated by tkernen@deckpoint.ch on 2010/12/03
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 570166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 578000000 8MHz 5/6 NONE QAM16 8k 1/4 NONE
-T 658166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 666166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 682166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 1/2 NONE QAM16 8k 1/4 NONE
-T 746166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 1/2 NONE QPSK 2k 1/32 NONE
-T 770166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 794166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 818166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 850166000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/cz-All b/dvb-t/cz-All
deleted file mode 100644
index 7c6d6011..00000000
--- a/dvb-t/cz-All
+++ /dev/null
@@ -1,41 +0,0 @@
-# Czech Republic, whole country
-# Created from http://www.digizone.cz/texty/mapy-pokryti-multiplex-1-ceska-televize/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-2-radiokomunikace/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-3-czech-digital-group/
-# and http://www.digizone.cz/texty/mapy-pokryti-multiplex-4-telefonica-o2/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/de-Baden-Wuerttemberg b/dvb-t/de-Baden-Wuerttemberg
deleted file mode 100644
index 200ef178..00000000
--- a/dvb-t/de-Baden-Wuerttemberg
+++ /dev/null
@@ -1,19 +0,0 @@
-# DVB-T Baden-Württemberg
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 634000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH41: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsPlus
-T 666000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH45: RTL, RTL 2, Super RTL, VOX, RTL Crime, Passion [Sendenorm: MPEG-4]
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: SWR-BW, Bayerisches Fernsehen, hr, WDR
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Das Erste, arte, Phoenix, EinsPlus
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: Das Erste, arte, Phoenix, EinsPlus
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsPlus
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsPlus
diff --git a/dvb-t/de-Bayern b/dvb-t/de-Bayern
deleted file mode 100644
index 6839380b..00000000
--- a/dvb-t/de-Bayern
+++ /dev/null
@@ -1,31 +0,0 @@
-# DVB-T Bayern
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 191500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # CH07: Das Erste, arte, Phoenix, EinsPlus (bis zum 11.12.2011)
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
- # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH27: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
- # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsPlus
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Das Erste, arte, Phoenix, EinsPlus
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, arte, Phoenix, EinsPlus
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: Bayerisches Fernsehen, BR-alpha, MDR, hr
- # CH40: Das Erste, arte, Phoenix, EinsPlus
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, arte, Phoenix, EinsPlus
- # CH42: Das Erste, arte, Phoenix, EinsPlus (Kanalwechsel am 12.12.2011)
- # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Das Erste, arte, Phoenix, EinsPlus
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Bayerisches Fernsehen, BR-alpha, MDR, hr
- # CH46: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Bayerisches Fernsehen, BR-alpha, MDR, hr
- # CH47: Das Erste, arte, Phoenix, EinsPlus
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Das Erste, arte, Phoenix, EinsPlus
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Bayerisches Fernsehen, BR-alpha, SWR, EinsExtra
- # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Das Erste, arte, Phoenix, EinsPlus
diff --git a/dvb-t/de-Berlin b/dvb-t/de-Berlin
index d66a54d4..416bd11b 100644
--- a/dvb-t/de-Berlin
+++ b/dvb-t/de-Berlin
@@ -1,12 +1,5 @@
# DVB-T Berlin
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: RTL, RTL2, Super RTL, VOX
-T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH27: Das Erste, RBB, Phoenix, EinsExtra / BrandenburgAktuell
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # CH39: QVC, DasVierte, Bibel.TV, BR-Fernsehen, n-tv, EuroNews/Channe21 Shop + 7 Radioprogr
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH47: MDR, NDR, arte
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH50: Tele5, HSE 24, WDR, SWR (BW / RP)
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH56: Eurosport, TV.B, Music1, sixx,
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH59: BerlinMix1, (freie Kapazitäten)
+T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # ard / rbb
+T 570000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # zdf
+T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # t-systems
diff --git a/dvb-t/de-Brandenburg b/dvb-t/de-Brandenburg
deleted file mode 100644
index d9c6f5c8..00000000
--- a/dvb-t/de-Brandenburg
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Brandenburg
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # CH53: Das Erste, RBB, Phoenix, EinsExtra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: MDR, NDR, arte
diff --git a/dvb-t/de-Bremen b/dvb-t/de-Bremen
deleted file mode 100644
index 3be3735d..00000000
--- a/dvb-t/de-Bremen
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Bremen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL 2, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona/Das Vierte
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
diff --git a/dvb-t/de-Hamburg b/dvb-t/de-Hamburg
deleted file mode 100644
index 7e5bca31..00000000
--- a/dvb-t/de-Hamburg
+++ /dev/null
@@ -1,11 +0,0 @@
-# DVB-T Hamburg
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele 5, Das Vierte, QVC, Channel21/ Euronews
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: SIXX, Hamburg 1, Bibel TV, Eurosport
-T 738000000 8MHz 1/2 NONE QAM64 8k 1/8 NONE # CH54: NDR HH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR SH
diff --git a/dvb-t/de-Hessen b/dvb-t/de-Hessen
deleted file mode 100644
index 132c02a6..00000000
--- a/dvb-t/de-Hessen
+++ /dev/null
@@ -1,19 +0,0 @@
-# DVB-T Hessen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: Phoenix, Bayerisches Fernsehen, SWR-RP, WDR
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH25: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: Das Erste, hr, arte / EinsExtra
-T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH34: RTL, RTL 2, Super RTL, VOX
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: Phoenix, Bayerisches Fernsehen, SWR-RP, MDR
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: Das Erste, hr, arte / EinsExtra
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: Phoenix, Bayerisches Fernsehen, SWR-RP
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, hr, arte / EinsExtra
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, QVC, rheinmaintv / Channel21, Bibel.TV
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: Bayerisches Fernsehen, hr, SWR-BW, WDR
-T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH54: ProSieben, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: Phoenix, NDR, MDR, WDR
diff --git a/dvb-t/de-Mecklenburg-Vorpommern b/dvb-t/de-Mecklenburg-Vorpommern
deleted file mode 100644
index 2d92c87d..00000000
--- a/dvb-t/de-Mecklenburg-Vorpommern
+++ /dev/null
@@ -1,12 +0,0 @@
-# DVB-T Mecklenburg-Vorpommernen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Das Erste, NDR MVP, RBB, MDR/NDR SH
-T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH37: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
diff --git a/dvb-t/de-Niedersachsen b/dvb-t/de-Niedersachsen
deleted file mode 100644
index cf474d2c..00000000
--- a/dvb-t/de-Niedersachsen
+++ /dev/null
@@ -1,29 +0,0 @@
-# DVB-T Niedersachsen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: Das Erste (RB), RB TV (NDR NDS), arte, Phoenix
- # CH22: Das Erste, arte, Phoenix, EinsExtra
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: RTL, RTL 2, Super RTL, VOX
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona/Das Vierte
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 562000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH32: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 610000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH38: Das Erste, arte, Phoenix, EinsExtra
- # CH38: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: RTL, RTL 2, Super RTL, VOX
- # CH42: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH43: Das Erste, arte, Phoenix, EinsExtra
- # CH43: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: ProSieben, Sat.1, Kabel1, N24
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: Tele 5, SIXX, QVC, Mona/Das Vierte
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsExtra
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: ProSieben, Sat.1, Kabel1, N24
-T 770000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH58: NDR NDS, WDR/NDR SH, MDR/NDR MVP, HR/NDR HH
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Das Erste, arte, Phoenix, EinsExtra
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Tele 5, Nickelodeon/Comedy Central, Eurosport, Mona/Das Vierte
diff --git a/dvb-t/de-Nordrhein-Westfalen b/dvb-t/de-Nordrhein-Westfalen
deleted file mode 100644
index 0d605917..00000000
--- a/dvb-t/de-Nordrhein-Westfalen
+++ /dev/null
@@ -1,23 +0,0 @@
-# DVB-T Nordrhein-Westfalen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH25: WDR-Dortmund, NDR/WDR-Essen, MDR, SWR
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsFestival
- # CH26: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 522000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH27: WDR-Siegen, NDR, MDR, SWR
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH29: RTL, RTL2, Super RTL, VOX
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 554000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH31: WDR-Bielefeld, NDR/WDR-Siegen, MDR, SWR
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: Tele5, CNN, Eurosport, VIVA
-T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH37: WDR-Aachen, NDR/WDR-Köln, MDR, SWR
-T 674000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH46: WDR-Düsseldorf, MDR/WDR-Duisburg, NDR/WDR-Wuppertal, SWR
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: Das Erste, arte, Phoenix, EinsFestival
-T 698000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE # CH49: WDR-Köln, MDR/WDR-Bonn, NDR/WDR-Aachen, SWR
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: Das Erste, arte, Phoenix, EinsFestival
-T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH52: Tele5, CNN, Eurosport, VIVA
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: ProSieben, Sat.1, Kabel1, N24
-T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH55: ProSieben, Sat.1, Kabel1, N24
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # CH57: WDR-Essen, NDR/WDR-Dortmund, MDR, SWR
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsFestival
diff --git a/dvb-t/de-Rheinland-Pfalz b/dvb-t/de-Rheinland-Pfalz
deleted file mode 100644
index 6eabe6d0..00000000
--- a/dvb-t/de-Rheinland-Pfalz
+++ /dev/null
@@ -1,12 +0,0 @@
-# DVB-T Rheinland-Pfalz
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH46: Das Erste, arte, Phoenix, EinsPlus
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH48: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: Das Erste, arte, Phoenix, EinsPlus
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Das Erste, arte, Phoenix, EinsPlus
-T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH60: Das Erste, arte, Phoenix, EinsPlus
diff --git a/dvb-t/de-Saarland b/dvb-t/de-Saarland
deleted file mode 100644
index 7ac26b30..00000000
--- a/dvb-t/de-Saarland
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Saarland
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH42: Das Erste, SR Fernsehen, arte, Phoenix
-T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH44: SWR-RP, Bayerisches Fernsehen, hr, WDR
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH49: Tele 5, QVC, Bibel.TV, freie Kapazität
diff --git a/dvb-t/de-Sachsen b/dvb-t/de-Sachsen
deleted file mode 100644
index e56762f1..00000000
--- a/dvb-t/de-Sachsen
+++ /dev/null
@@ -1,14 +0,0 @@
-# DVB-T Sachsen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL 2, Super RTL, VOX, RTL Crime, RTL Passion [Sendenorm: MPEG-4]
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE # CH31: LF Leipzg.Ferns., InfoTVLeipzig, BBCWorld, Bibel.TV, RadioLeipzig, RadioHoreb
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH32: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH36: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH37: MDR-SN, rbb, Bayerisches Fernsehen, WDR
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH39: Das Erste, arte, Phoenix, EinsFestival
diff --git a/dvb-t/de-Sachsen-Anhalt b/dvb-t/de-Sachsen-Anhalt
deleted file mode 100644
index 9ff5de38..00000000
--- a/dvb-t/de-Sachsen-Anhalt
+++ /dev/null
@@ -1,13 +0,0 @@
-# DVB-T Sachsen-Anhalt
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH24: Das Erste, arte, Phoenix, EinsFestival
-T 530000000 8MHz 3/4 NONE QAM16 8k 1/8 NONE # CH28: RTL, RTL 2, Super RTL, VOX, RTL Crime, RTL Passion [Sendenorm: MPEG-4]
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH29: Das Erste, arte, Phoenix, EinsFestival
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH34: MDR-ST, rbb, NDR, WDR
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH38: MDR-ST, rbb, NDR, WDR
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH41: Das Erste, arte, Phoenix, EinsFestival
-T 746000000 8MHz 2/3 NONE QPSK 8k 1/8 NONE # CH55: TV Halle (Testbetrieb)
diff --git a/dvb-t/de-Schleswig-Holstein b/dvb-t/de-Schleswig-Holstein
deleted file mode 100644
index a4b905e5..00000000
--- a/dvb-t/de-Schleswig-Holstein
+++ /dev/null
@@ -1,18 +0,0 @@
-# DVB-T Schleswig-Holstein
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH21: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH24: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH26: Das Erste, arte, Phoenix, EinsExtra
-T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH28: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 554000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH31: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste, arte, Phoenix, EinsExtra
-T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH35: ProSieben, Sat.1/ Sat.1Regional, Kabel1, N24
-T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH39: NDR SH, WDR/NDR NDS, MDR/NDR MVP, BR Fernsehen/NDR HH
-T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
-T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH45: RTL / Guten Abend RTL, RTL 2, Super RTL, VOX
-T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH47: Das Erste, arte, Phoenix, EinsExtra
-T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH57: Tele 5, SIXX, das Vierte, Bibel TV
-T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH59: Tele 5, SIXX, das Vierte, Bibel TV
diff --git a/dvb-t/de-Thueringen b/dvb-t/de-Thueringen
deleted file mode 100644
index 887dae8c..00000000
--- a/dvb-t/de-Thueringen
+++ /dev/null
@@ -1,10 +0,0 @@
-# DVB-T Thüringen
-# Created from http://www.ueberallfernsehen.de/data/senderliste.pdf
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH21: Das Erste, arte, Phoenix, EinsFestival
-T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH22: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH25: Das Erste, arte, Phoenix, EinsFestival
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH27: MDR-TH, rbb, hr, Bayerisches Fernsehen
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH48: MDR-TH, rbb, hr, Bayerisches Fernsehen
-T 706000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH50: ZDF, 3sat, KiKa / ZDFneo, ZDFinfo
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CH53: Das Erste, arte, Phoenix, EinsFestival
diff --git a/dvb-t/dk-All b/dvb-t/dk-All
deleted file mode 100644
index 931b1afa..00000000
--- a/dvb-t/dk-All
+++ /dev/null
@@ -1,23 +0,0 @@
-# Denmark, whole country
-# Created from http://www.digi-tv.dk/Indhold_og_tilbud/frekvenser.asp
-# and http://www.digi-tv.dk/Sendenettets_opbygning/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Albacete b/dvb-t/es-Albacete
deleted file mode 100644
index 7d938023..00000000
--- a/dvb-t/es-Albacete
+++ /dev/null
@@ -1,14 +0,0 @@
-# Spain, Albacete - Update 2010/08/12 (Freud)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 37: La Regional, TCM, CRN
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 46: Sogecuatro, laSexta2, laSexta3 (Todos pendientes de asignar)
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 47: CNC, Vision6, ABTeVe, Punto Radio
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: Boing, La 10, MTV, Punto Radio
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 53: Nitro, Marca TV, Veo13
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 56: TVE HD, Teledeporte, Pruebas TVE, RNE 1, RNE CLÃSICA, RNE 3
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: La 1, La 2, 24H, Clan, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: CMT, CMT2, RCM
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo7, Tienda en Veo, Intereconomía, AXN, Teledeporte, Radio Intereconomía, Radio Marca, esRadio, Vaughan Radio
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, Canal+ Dos, Canal Club, LaSexta, SER, 40 Principales, Cadena Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía
diff --git a/dvb-t/es-Alfabia b/dvb-t/es-Alfabia
deleted file mode 100644
index 5852cef9..00000000
--- a/dvb-t/es-Alfabia
+++ /dev/null
@@ -1,11 +0,0 @@
-# DVB-T Alfabia, Mallorca, Balearic Islands, Spain.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3 Cat, 3/24, 33, Super3/300
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV Mallorca, Canal 4
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Popular TV, TEVEi
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.65: IB3, Aprenda Ingles TV
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.66: NetTV, Teledeporte, VeoTV1, VeoTV2.
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.67: 40 Latino TV, CNN+, Cuatro, La Sexta 1.
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport.
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.69: Antena 3, La Sexta 2, Neox, Nova.
diff --git a/dvb-t/es-Alicante b/dvb-t/es-Alicante
deleted file mode 100644
index c8b5620d..00000000
--- a/dvb-t/es-Alicante
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Alicante, Spain
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 55: TV3, K33/33, 3/24, Canal 300
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Alpicat b/dvb-t/es-Alpicat
deleted file mode 100644
index fe4f7269..00000000
--- a/dvb-t/es-Alpicat
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Alpicat (Lleida)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c58: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
diff --git a/dvb-t/es-Asturias b/dvb-t/es-Asturias
deleted file mode 100644
index f5069dff..00000000
--- a/dvb-t/es-Asturias
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Asturias
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TPA TPA2
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
diff --git a/dvb-t/es-BaixoMinho b/dvb-t/es-BaixoMinho
deleted file mode 100644
index 6f6fde45..00000000
--- a/dvb-t/es-BaixoMinho
+++ /dev/null
@@ -1,16 +0,0 @@
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20090528 1 0 OFDM ES </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Baixo Minho, Pontevedra (Spain)
-# date (yyyy-mm-dd) : 2009-07-11
-# provided by (opt) : neonmann@gmail.com
-#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RAR Pontevedra
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE GALICIA
diff --git a/dvb-t/es-Bilbao b/dvb-t/es-Bilbao
deleted file mode 100644
index 83313634..00000000
--- a/dvb-t/es-Bilbao
+++ /dev/null
@@ -1,6 +0,0 @@
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CNN+. Cuatro, La Sexta, 40 latino TV
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, La Sexta 2, Neo, Nova, Telehit, Onda Cero, Europa FM, Onda Melodia
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: ETB1, ETB2, ETB-Sat, Canal Vasco, Euskadi Irratia, Radio Euskadi, Euskadi Gastea, Radio EITB
diff --git a/dvb-t/es-Cadiz b/dvb-t/es-Cadiz
deleted file mode 100644
index 68ace6b8..00000000
--- a/dvb-t/es-Cadiz
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Cadiz (Andalucia) by terrex Feb 2009
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C64
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
diff --git a/dvb-t/es-Carceres b/dvb-t/es-Carceres
deleted file mode 100644
index 3d3f77c4..00000000
--- a/dvb-t/es-Carceres
+++ /dev/null
@@ -1,10 +0,0 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 39: 8Madrid, TMT-Popular TV, Kiss TV, Intereconomía TV
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 50: EsMadrid TV, Ver-t, EM2, Libertad Digital TV
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: Canal Extremadura, Extremadura Television
diff --git a/dvb-t/es-Collserola b/dvb-t/es-Collserola
index 395bd164..04ffe542 100644
--- a/dvb-t/es-Collserola
+++ b/dvb-t/es-Collserola
@@ -1,12 +1,6 @@
# DVB-T Collserola (Barcelona)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c26: BTV, TV Badalona, TV L'Hospitalet, TV del Besòs, COM Ràdio, Ràdio Ciutat Badalona, Ràdio L'Hospitalet
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c33: 8TV, Barça TV, EDC3, 105TV, RAC 1, RAC 105
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c43: TV3HD, 3/24, Canal 9, IB3, Catalunya Música, iCat FM
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c48: Urbe TV, Canal Català, 25 TV, Localia, Ona FM, Onda Rambla, Sensació Ràdio
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c61: TV3, 33, 3/24, K3/300, Catalunya Ràdio, Catalunya Informació
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c64: TVE1, TVE2, TVE 24H, Clan/TVE 50 Años, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c66: Veo7, Sony TV en Veo, Tienda en Veo, Intereconomía, Teledeporte, Radio Intereconomía, Radio Marca
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c67: Cuatro, CNN+, 40 Latino, La Sexta, Ser, 40 Principales, Cadena Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c68: Telecino, La Siete, FDF, CincoShop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c69: Antena 3, Antena.Neox, Antena.Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodía
+T 650000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # C43: tvc
+T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C61: tve, t5, a3, c+
+T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66: veotv, nettv
+
diff --git a/dvb-t/es-Donostia b/dvb-t/es-Donostia
deleted file mode 100644
index fe38efdb..00000000
--- a/dvb-t/es-Donostia
+++ /dev/null
@@ -1,13 +0,0 @@
-# The channels with 1/32 guard-interval are French and should be perfectly visible
-# here. However I have only managed to get a lock for the channel 57 of the French ones.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Granada b/dvb-t/es-Granada
deleted file mode 100644
index 05847f1e..00000000
--- a/dvb-t/es-Granada
+++ /dev/null
@@ -1,8 +0,0 @@
-# Spain, Granada
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Huesca b/dvb-t/es-Huesca
deleted file mode 100644
index 8079b83d..00000000
--- a/dvb-t/es-Huesca
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T Huesca (Aragón) [Spain] [es-Huesca]
-# Generated by Vicente Hernando Ara <bizenton@gmail.com>
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Canal 57: ARAGON TV, ARAGON RADIO, ARAGON HD
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomia, Radio Intereconomia, RADIO MARCA
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, PROMO, SER, 40 PRINCIPALES, CADENA DIAL
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, FDF, Telecinco 2, Disney Channel, Cincoshop
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÃA, HOGAR 10
diff --git a/dvb-t/es-Las_Palmas b/dvb-t/es-Las_Palmas
deleted file mode 100644
index f260327a..00000000
--- a/dvb-t/es-Las_Palmas
+++ /dev/null
@@ -1,18 +0,0 @@
-# Funciona correctamente en Las Palmas de Gran Canaria (25-09-2010)
-#
-# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
-# http://www.gulic.org
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 28: TVE HD, Teledeporte, RNE Clásica, RNE 3
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 32: Boing, Telecinco HD, La 10, MTV, Punto Radio
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 35: Sogecuatro, LaSexta2, LaSexta3
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 38: Nitro, Antena 3 HD, Marca TV, Veo13
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 44: Canal 7 Gran Canaria, TIC Canal 8, Canal 4, RTI
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 52: Localia, Nueve TV, Nueve Radio
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: TVE1, TVE2, 24H TVE, Clan/TVE, RNE, RNEC, RNE3, Lanzadera, EPG, Digitext, Meteo, Bolsa, Trafico, Empleat
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 65: TV C, TV C2, Antena 3 Canarias, Popular TV, Canarias Radio, Cope, Cadena 100, Radio ECCA, Lanzadera, Ticker, Piloto TDT
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo7, Tienda en Veo, AXN, Intereconomia, Teledeporte, Radio Intereconomia, Radio Marca, esRadio, Vaughan Radio, Canal Ingeniería, GUIDE Plus +, C66Gancho, C66Lanzadera, C66EPG, EpgNet
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, Canal+ Dos, Canal Club, laSexta, SER, 40 Principales, Cadena Dial, Lanzadera, EPG TDT, Ticker, Lanzadera, Noticias, EPG
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, La Siete, FDF, CincoShop, Disney Channel, T5Lanzadera, T5Digitext, Noticias, Tiempo, Bolsa, Tráfico
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Gol Televisión, Onda Cero, Europa FM, Onda Melodía, tvtv DIGITAL, A3Lanzadera, A3Portal, A3EPG, A3Ticker, T-seniority, Gol Bar
diff --git a/dvb-t/es-Lugo b/dvb-t/es-Lugo
deleted file mode 100644
index 7b765440..00000000
--- a/dvb-t/es-Lugo
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Lugo (Centro emisor Paramo) - Rev. 1.2 - 11.12.05
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, 24H TVE, CLAN/50 TVE, RNE1, RNE CLASICA, RNE3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVG, GALICIA TV AMERICA, RADIO GALEGA, R.GALEGA MUSICA, SON GALICIA RADIO, PROBAS RETEGAL
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TELECINCO, T5 ESTRELLAS, T5 SPORT, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
diff --git a/dvb-t/es-Madrid b/dvb-t/es-Madrid
deleted file mode 100644
index 56cf68ff..00000000
--- a/dvb-t/es-Madrid
+++ /dev/null
@@ -1,22 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20110306 2 0 OFDM ES </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: <add description here>
-# date (yyyy-mm-dd) : 2011-03-16
-# provided by (opt) : <your name or email here>
-#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Teledifusion Madrid
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # RGE MADRID
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TDT-CAM
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SFN
diff --git a/dvb-t/es-Malaga b/dvb-t/es-Malaga
deleted file mode 100644
index 290e1860..00000000
--- a/dvb-t/es-Malaga
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Malaga (Andalucia) by Pedro Leon 4 Mayo 2007
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57 La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Clásica, RNE 3
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63 Canal Sur, Canal 2 Andalucia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66 TELEDEPORTE, VEO, *Canal Ingenieria, SETenVEO, Tienda en VEO, NET TV, Radio Intereconomia
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67 CUATRO, CNN+, 40 LATINO, laSexta
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68 Telecinco, T5 Estrellas, T5 Sport, FLYMUSIC, PUNTO RADIO
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69 ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, *tvtv DIGITAL, ONDA CERO, EUROPA FM, ONDA MELODIA, Telehit
-# * Canales de datos o MHT
diff --git a/dvb-t/es-Muros-Noia b/dvb-t/es-Muros-Noia
deleted file mode 100644
index a02c31db..00000000
--- a/dvb-t/es-Muros-Noia
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Muros and Noia
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 27: Local Ribeira
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 61: RAR A Corunha
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: RGE Galicia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: SFN 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: SFN 2
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: SFN 3
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: SFN 4
diff --git a/dvb-t/es-Mussara b/dvb-t/es-Mussara
deleted file mode 100644
index a5147b4f..00000000
--- a/dvb-t/es-Mussara
+++ /dev/null
@@ -1,8 +0,0 @@
-# DVB-T La Mussara (Reus-Tarragona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c59: TV3, K3/33, 3/24, 300, 3i
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
diff --git a/dvb-t/es-Pamplona b/dvb-t/es-Pamplona
deleted file mode 100644
index 4644b2d3..00000000
--- a/dvb-t/es-Pamplona
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Pamplona
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Rocacorba b/dvb-t/es-Rocacorba
deleted file mode 100644
index 8eebbbfd..00000000
--- a/dvb-t/es-Rocacorba
+++ /dev/null
@@ -1,6 +0,0 @@
-# DVB-T Rocacorba (Girona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CUATRO
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3XL.NET, 3/24, CANAL PILOT
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SERVICIO PRUEBAS CANAL 67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #
diff --git a/dvb-t/es-SC_Tenerife b/dvb-t/es-SC_Tenerife
deleted file mode 100644
index 0706513d..00000000
--- a/dvb-t/es-SC_Tenerife
+++ /dev/null
@@ -1,18 +0,0 @@
-# Funciona correctamente en Santa Cruz de Tenerife (25-09-2010)
-#
-# Revisada y corregida por el Grupo de Usuarios de Linux de Canarias
-# http://www.gulic.org
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C23
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C24
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C26
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C29
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C45
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C56
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C60
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
diff --git a/dvb-t/es-Santander b/dvb-t/es-Santander
deleted file mode 100644
index 214badbe..00000000
--- a/dvb-t/es-Santander
+++ /dev/null
@@ -1,7 +0,0 @@
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Santiago_de_Compostela b/dvb-t/es-Santiago_de_Compostela
deleted file mode 100644
index cf63e64b..00000000
--- a/dvb-t/es-Santiago_de_Compostela
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Santiago de Compostela
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: Local Santiago
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 40: RAR Santiago
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: RGE Galicia
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: SFN 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: SFN 2
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: SFN 3
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: SFN 4
diff --git a/dvb-t/es-Sevilla b/dvb-t/es-Sevilla
deleted file mode 100644
index 0c7361df..00000000
--- a/dvb-t/es-Sevilla
+++ /dev/null
@@ -1,23 +0,0 @@
-# DVB-T Sevilla (Spain) by x2 15-agos-2010, modificado 15-ago-2010
-# thanks to http://www.tdt1.com
-# thanks to http://wirbel.htpc-forum.de/w_scan/index2.html
-# T freq bw fec_hi fec_lo mod transm-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C33
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C36
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C38
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C41
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C44
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C45
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C49
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C52
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C54
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C55
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C56
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C57
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C61
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C67
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C68
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C69
diff --git a/dvb-t/es-Tenerife b/dvb-t/es-Tenerife
deleted file mode 100644
index 71b04be8..00000000
--- a/dvb-t/es-Tenerife
+++ /dev/null
@@ -1,14 +0,0 @@
-# DVB-T Tenerife, Spain (03/04/2011)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: laSexta 2, laSexta 3, laSexta HD, C+ 2, Cuatro
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 24: Canal 7, Mírame, Canal 4 Tenerife
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 26: Nitro, Antena 3, Marca, 13
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 29: Boing, Tele5 HD, MTV, La 10
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 45: TVE HD, tdp
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 56: Canal 6 TeideVisión, ElDía
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 59: TV Canaria, TV Canaria 2, Antena 3 Canaria
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 60: La 1, La 2, 24h, Clan
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Teledeporte, Canal Ingeniería, Veo7, Intereconomía
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: laSexta, laSexta 3, Gol Televisión, Cuatro, Divinity, La Tienda en Casa
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Tele5, FDF, laSiete, Disney Channel, Intereconomía
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Neox, Nova, Veo7, AXN
diff --git a/dvb-t/es-Valencia b/dvb-t/es-Valencia
deleted file mode 100644
index 91614d0e..00000000
--- a/dvb-t/es-Valencia
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Valencia, Spain
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 23: TMV, Tele 7, Aprende ingles TV, Ed. Prensa Val.,R.Mediamed
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 55: TV3, 33, 3/24, K3/300
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 57: Canal 9, Punt 2, Popular TV, LP Teva, Radio 9, Si Radio
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: TVE 1, La 2, 24H TVE, Clan TVE, RNE 1, RNE C, RNE 3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Sony TV en Veo, Tienda en Veo, Intereconomia, Teledeporte, R. Interec., R. Marca
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, Promo, La Sexta, Ser, 40 Princ., Cad. Dial
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco 2, FDF, Cinco Shop, Disney Channel, Punto Radio
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, Hogar 10, Onda Cero, Europa FM, Onda Melodia
diff --git a/dvb-t/es-Valladolid b/dvb-t/es-Valladolid
deleted file mode 100644
index 961554b4..00000000
--- a/dvb-t/es-Valladolid
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Valladolid
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 57: Clan TVE, 24H TVE, La 2, TVE 1, RNE1, RNE3, RNC
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
diff --git a/dvb-t/es-Vilamarxant b/dvb-t/es-Vilamarxant
deleted file mode 100644
index a3867c19..00000000
--- a/dvb-t/es-Vilamarxant
+++ /dev/null
@@ -1,4 +0,0 @@
-# DVB-T Vilamarxant, Valencia, C. Valenciana, Spain.
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/es-Vitoria-Gasteiz b/dvb-t/es-Vitoria-Gasteiz
deleted file mode 100644
index 5d97413a..00000000
--- a/dvb-t/es-Vitoria-Gasteiz
+++ /dev/null
@@ -1,8 +0,0 @@
-# Channel names in use at 2009/07/12, in Channel 66 [fffe] is a scrambled channel.
-# In the generated *channels.conf file could be necesary to change Intereconomía, Radio Intereconomía, ONDA MELODÃA to Intereconomia, Radio Intereconomia, ONDA MELODIA for Totem to work well.
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 58: ETB1, ETB2, ETB3, ETBSAT, Euskadi Irratia, Gaztea, EiTB Irratia, Radio Euskadi, Radio Vitoria
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: La 1, La 2, 24h, Clan, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: Teledeporte, Canal Ingenieria, VEO7, SONY TV en VEO, Tienda en VEO, GUIDE PLUS+, Intereconomía, Radio Intereconomía, [fffe], RADIO MARCA
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: laSexta, CUATRO, CNN+, 40 LATINO, CANAL CLUB, SER, 40 PRINCIPALES, CADENA DIAL
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: Telecinco, FDF, LaSiete, Disney Channel, Cincoshop
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, ONDA CERO, EUROPA FM, ONDA MELODÃA, HOGAR 10
diff --git a/dvb-t/es-Zaragoza b/dvb-t/es-Zaragoza
deleted file mode 100644
index b9a3c90a..00000000
--- a/dvb-t/es-Zaragoza
+++ /dev/null
@@ -1,7 +0,0 @@
-# DVB-T Zaragoza (Aragón) [Spain] [es-Zaragoza]
-# Generated by Víctor Martínez Romanos <vmromanos@gmail.com>
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 63: TVE 1, TVE 2, 24H, CLAN/50, RNE1, RNEC, RNE3
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 66: TELEDEPORTE, VEO TV, VEO 2, NET TV
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 67: CUATRO, CNN+, 40 LATINO, LA SEXTA 1
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 68: T5 ESTRELLAS, T5 SPORT, TELECINCO, FLYMUSIC
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Canal 69: ANTENA 3, ANTENA.NEOX, ANTENA.NOVA, LA SEXTA 2
diff --git a/dvb-t/fi-Aanekoski b/dvb-t/fi-Aanekoski
deleted file mode 100644
index 484a7620..00000000
--- a/dvb-t/fi-Aanekoski
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Aanekoski_Konginkangas b/dvb-t/fi-Aanekoski_Konginkangas
deleted file mode 100644
index cc095f29..00000000
--- a/dvb-t/fi-Aanekoski_Konginkangas
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ahtari b/dvb-t/fi-Ahtari
deleted file mode 100644
index 12a4150d..00000000
--- a/dvb-t/fi-Ahtari
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ala-Vuokki b/dvb-t/fi-Ala-Vuokki
deleted file mode 100644
index 1e3b99f8..00000000
--- a/dvb-t/fi-Ala-Vuokki
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Alajarvi b/dvb-t/fi-Alajarvi
deleted file mode 100644
index 0df21ae5..00000000
--- a/dvb-t/fi-Alajarvi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ammansaari b/dvb-t/fi-Ammansaari
deleted file mode 100644
index 80c16073..00000000
--- a/dvb-t/fi-Ammansaari
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Anjalankoski b/dvb-t/fi-Anjalankoski
deleted file mode 100644
index 273bc926..00000000
--- a/dvb-t/fi-Anjalankoski
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Enontekio_Raattama b/dvb-t/fi-Enontekio_Raattama
deleted file mode 100644
index 0985bcce..00000000
--- a/dvb-t/fi-Enontekio_Raattama
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Espoo b/dvb-t/fi-Espoo
index 2764c44b..dd0619bc 100644
--- a/dvb-t/fi-Espoo
+++ b/dvb-t/fi-Espoo
@@ -1,6 +1,3 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
+# Espoo A-mux (Digita Finland)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Eurajoki b/dvb-t/fi-Eurajoki
deleted file mode 100644
index 6ed4e1ba..00000000
--- a/dvb-t/fi-Eurajoki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Fiskars b/dvb-t/fi-Fiskars
deleted file mode 100644
index 8e85e632..00000000
--- a/dvb-t/fi-Fiskars
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Haapavesi b/dvb-t/fi-Haapavesi
deleted file mode 100644
index 6d8956b2..00000000
--- a/dvb-t/fi-Haapavesi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hameenkyro_Kyroskoski b/dvb-t/fi-Hameenkyro_Kyroskoski
deleted file mode 100644
index 408e9d44..00000000
--- a/dvb-t/fi-Hameenkyro_Kyroskoski
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hameenlinna_Painokangas b/dvb-t/fi-Hameenlinna_Painokangas
deleted file mode 100644
index 75278afa..00000000
--- a/dvb-t/fi-Hameenlinna_Painokangas
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hanko b/dvb-t/fi-Hanko
deleted file mode 100644
index fb5e4270..00000000
--- a/dvb-t/fi-Hanko
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hartola b/dvb-t/fi-Hartola
deleted file mode 100644
index fac38d7f..00000000
--- a/dvb-t/fi-Hartola
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Haukela b/dvb-t/fi-Haukela
deleted file mode 100644
index b47f913e..00000000
--- a/dvb-t/fi-Haukela
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Heinavesi b/dvb-t/fi-Heinavesi
deleted file mode 100644
index e921f2d1..00000000
--- a/dvb-t/fi-Heinavesi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Heinola b/dvb-t/fi-Heinola
deleted file mode 100644
index 6b6c815b..00000000
--- a/dvb-t/fi-Heinola
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hetta b/dvb-t/fi-Hetta
deleted file mode 100644
index c9ccb85a..00000000
--- a/dvb-t/fi-Hetta
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hossa b/dvb-t/fi-Hossa
deleted file mode 100644
index 41093504..00000000
--- a/dvb-t/fi-Hossa
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Houtskari b/dvb-t/fi-Houtskari
deleted file mode 100644
index 6d2fea70..00000000
--- a/dvb-t/fi-Houtskari
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hyrynsalmi b/dvb-t/fi-Hyrynsalmi
deleted file mode 100644
index 32b3b5f8..00000000
--- a/dvb-t/fi-Hyrynsalmi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hyrynsalmi_Kyparavaara b/dvb-t/fi-Hyrynsalmi_Kyparavaara
deleted file mode 100644
index cb9f8581..00000000
--- a/dvb-t/fi-Hyrynsalmi_Kyparavaara
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hyrynsalmi_Paljakka b/dvb-t/fi-Hyrynsalmi_Paljakka
deleted file mode 100644
index 29939d6e..00000000
--- a/dvb-t/fi-Hyrynsalmi_Paljakka
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Hyvinkaa_Musta-Mannisto b/dvb-t/fi-Hyvinkaa_Musta-Mannisto
deleted file mode 100644
index 62f24e7b..00000000
--- a/dvb-t/fi-Hyvinkaa_Musta-Mannisto
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 350000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ii_Raiskio b/dvb-t/fi-Ii_Raiskio
deleted file mode 100644
index 7b318315..00000000
--- a/dvb-t/fi-Ii_Raiskio
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Iisalmi b/dvb-t/fi-Iisalmi
deleted file mode 100644
index a6d3546f..00000000
--- a/dvb-t/fi-Iisalmi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ikaalinen b/dvb-t/fi-Ikaalinen
deleted file mode 100644
index ee909852..00000000
--- a/dvb-t/fi-Ikaalinen
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ikaalinen_Riitiala b/dvb-t/fi-Ikaalinen_Riitiala
deleted file mode 100644
index 783785a2..00000000
--- a/dvb-t/fi-Ikaalinen_Riitiala
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Inari b/dvb-t/fi-Inari
deleted file mode 100644
index 39c9c0d8..00000000
--- a/dvb-t/fi-Inari
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Inari_Janispaa b/dvb-t/fi-Inari_Janispaa
deleted file mode 100644
index 78957e4f..00000000
--- a/dvb-t/fi-Inari_Janispaa
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Inari_Naatamo b/dvb-t/fi-Inari_Naatamo
deleted file mode 100644
index d4f2158b..00000000
--- a/dvb-t/fi-Inari_Naatamo
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ivalo_Saarineitamovaara b/dvb-t/fi-Ivalo_Saarineitamovaara
deleted file mode 100644
index 53e2382a..00000000
--- a/dvb-t/fi-Ivalo_Saarineitamovaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jalasjarvi b/dvb-t/fi-Jalasjarvi
deleted file mode 100644
index 9273e810..00000000
--- a/dvb-t/fi-Jalasjarvi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jamsa_Kaipola b/dvb-t/fi-Jamsa_Kaipola
deleted file mode 100644
index e872fb6e..00000000
--- a/dvb-t/fi-Jamsa_Kaipola
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jamsa_Kuorevesi_Halli b/dvb-t/fi-Jamsa_Kuorevesi_Halli
deleted file mode 100644
index e20ef649..00000000
--- a/dvb-t/fi-Jamsa_Kuorevesi_Halli
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jamsa_Matkosvuori b/dvb-t/fi-Jamsa_Matkosvuori
deleted file mode 100644
index 03e1dd91..00000000
--- a/dvb-t/fi-Jamsa_Matkosvuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jamsa_Ouninpohja b/dvb-t/fi-Jamsa_Ouninpohja
deleted file mode 100644
index a22369ff..00000000
--- a/dvb-t/fi-Jamsa_Ouninpohja
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jamsankoski b/dvb-t/fi-Jamsankoski
deleted file mode 100644
index a85ec1ec..00000000
--- a/dvb-t/fi-Jamsankoski
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Joensuu_Vestinkallio b/dvb-t/fi-Joensuu_Vestinkallio
deleted file mode 100644
index bbddf13e..00000000
--- a/dvb-t/fi-Joensuu_Vestinkallio
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Joroinen_Puukkola-Huutokoski b/dvb-t/fi-Joroinen_Puukkola-Huutokoski
deleted file mode 100644
index 57cdf254..00000000
--- a/dvb-t/fi-Joroinen_Puukkola-Huutokoski
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Joutsa_Lankia b/dvb-t/fi-Joutsa_Lankia
deleted file mode 100644
index 94774af2..00000000
--- a/dvb-t/fi-Joutsa_Lankia
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Joutseno b/dvb-t/fi-Joutseno
deleted file mode 100644
index 3e8d231b..00000000
--- a/dvb-t/fi-Joutseno
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Juntusranta b/dvb-t/fi-Juntusranta
deleted file mode 100644
index 80c16073..00000000
--- a/dvb-t/fi-Juntusranta
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Juupajoki_Kopsamo b/dvb-t/fi-Juupajoki_Kopsamo
deleted file mode 100644
index cd85e85a..00000000
--- a/dvb-t/fi-Juupajoki_Kopsamo
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Juva b/dvb-t/fi-Juva
deleted file mode 100644
index a1907d86..00000000
--- a/dvb-t/fi-Juva
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Jyvaskyla b/dvb-t/fi-Jyvaskyla
deleted file mode 100644
index a85ec1ec..00000000
--- a/dvb-t/fi-Jyvaskyla
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kaavi_Luikonlahti b/dvb-t/fi-Kaavi_Luikonlahti
deleted file mode 100644
index e4df587f..00000000
--- a/dvb-t/fi-Kaavi_Luikonlahti
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kajaani_Pollyvaara b/dvb-t/fi-Kajaani_Pollyvaara
deleted file mode 100644
index b647e34d..00000000
--- a/dvb-t/fi-Kajaani_Pollyvaara
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kalajoki b/dvb-t/fi-Kalajoki
deleted file mode 100644
index a0e7e7a2..00000000
--- a/dvb-t/fi-Kalajoki
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kangaslampi b/dvb-t/fi-Kangaslampi
deleted file mode 100644
index 79629750..00000000
--- a/dvb-t/fi-Kangaslampi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kangasniemi_Turkinmaki b/dvb-t/fi-Kangasniemi_Turkinmaki
deleted file mode 100644
index 464d13a0..00000000
--- a/dvb-t/fi-Kangasniemi_Turkinmaki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kankaanpaa b/dvb-t/fi-Kankaanpaa
deleted file mode 100644
index e2057bdc..00000000
--- a/dvb-t/fi-Kankaanpaa
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Karigasniemi b/dvb-t/fi-Karigasniemi
deleted file mode 100644
index 76dece6b..00000000
--- a/dvb-t/fi-Karigasniemi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Karkkila b/dvb-t/fi-Karkkila
deleted file mode 100644
index de76a2c9..00000000
--- a/dvb-t/fi-Karkkila
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Karstula b/dvb-t/fi-Karstula
deleted file mode 100644
index ba686aaa..00000000
--- a/dvb-t/fi-Karstula
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Karvia b/dvb-t/fi-Karvia
deleted file mode 100644
index 6d325cf5..00000000
--- a/dvb-t/fi-Karvia
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kaunispaa b/dvb-t/fi-Kaunispaa
deleted file mode 100644
index 39c9c0d8..00000000
--- a/dvb-t/fi-Kaunispaa
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kemijarvi_Suomutunturi b/dvb-t/fi-Kemijarvi_Suomutunturi
deleted file mode 100644
index e3d091e8..00000000
--- a/dvb-t/fi-Kemijarvi_Suomutunturi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kerimaki b/dvb-t/fi-Kerimaki
deleted file mode 100644
index b049818e..00000000
--- a/dvb-t/fi-Kerimaki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Keuruu b/dvb-t/fi-Keuruu
deleted file mode 100644
index 89a30cac..00000000
--- a/dvb-t/fi-Keuruu
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Keuruu_Haapamaki b/dvb-t/fi-Keuruu_Haapamaki
deleted file mode 100644
index 7f461068..00000000
--- a/dvb-t/fi-Keuruu_Haapamaki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kihnio b/dvb-t/fi-Kihnio
deleted file mode 100644
index 23d5c5c8..00000000
--- a/dvb-t/fi-Kihnio
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kiihtelysvaara b/dvb-t/fi-Kiihtelysvaara
deleted file mode 100644
index b5c51261..00000000
--- a/dvb-t/fi-Kiihtelysvaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kilpisjarvi b/dvb-t/fi-Kilpisjarvi
deleted file mode 100644
index 083137a1..00000000
--- a/dvb-t/fi-Kilpisjarvi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kittila_Sirkka_Levitunturi b/dvb-t/fi-Kittila_Sirkka_Levitunturi
deleted file mode 100644
index f35911fc..00000000
--- a/dvb-t/fi-Kittila_Sirkka_Levitunturi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kolari_Vuolittaja b/dvb-t/fi-Kolari_Vuolittaja
deleted file mode 100644
index fd29f57c..00000000
--- a/dvb-t/fi-Kolari_Vuolittaja
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Koli b/dvb-t/fi-Koli
deleted file mode 100644
index 8da50ba0..00000000
--- a/dvb-t/fi-Koli
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Korpilahti_Vaarunvuori b/dvb-t/fi-Korpilahti_Vaarunvuori
deleted file mode 100644
index a85ec1ec..00000000
--- a/dvb-t/fi-Korpilahti_Vaarunvuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Korppoo b/dvb-t/fi-Korppoo
deleted file mode 100644
index 6d2fea70..00000000
--- a/dvb-t/fi-Korppoo
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kruunupyy b/dvb-t/fi-Kruunupyy
deleted file mode 100644
index d4b7164a..00000000
--- a/dvb-t/fi-Kruunupyy
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuhmo_Iivantiira b/dvb-t/fi-Kuhmo_Iivantiira
deleted file mode 100644
index 07407bfe..00000000
--- a/dvb-t/fi-Kuhmo_Iivantiira
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuhmo_Lentiira b/dvb-t/fi-Kuhmo_Lentiira
deleted file mode 100644
index 9d0623d5..00000000
--- a/dvb-t/fi-Kuhmo_Lentiira
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuhmoinen b/dvb-t/fi-Kuhmoinen
deleted file mode 100644
index bbcd06b5..00000000
--- a/dvb-t/fi-Kuhmoinen
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuhmoinen_Harjunsalmi b/dvb-t/fi-Kuhmoinen_Harjunsalmi
deleted file mode 100644
index 933b4592..00000000
--- a/dvb-t/fi-Kuhmoinen_Harjunsalmi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuhmoinen_Puukkoinen b/dvb-t/fi-Kuhmoinen_Puukkoinen
deleted file mode 100644
index 96611f91..00000000
--- a/dvb-t/fi-Kuhmoinen_Puukkoinen
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuopio b/dvb-t/fi-Kuopio
deleted file mode 100644
index 9e71fe9e..00000000
--- a/dvb-t/fi-Kuopio
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kustavi_Viherlahti b/dvb-t/fi-Kustavi_Viherlahti
deleted file mode 100644
index 187d6189..00000000
--- a/dvb-t/fi-Kustavi_Viherlahti
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kuttanen b/dvb-t/fi-Kuttanen
deleted file mode 100644
index 09a14cac..00000000
--- a/dvb-t/fi-Kuttanen
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Kyyjarvi_Noposenaho b/dvb-t/fi-Kyyjarvi_Noposenaho
deleted file mode 100644
index f0068210..00000000
--- a/dvb-t/fi-Kyyjarvi_Noposenaho
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Lahti b/dvb-t/fi-Lahti
deleted file mode 100644
index 23f3b299..00000000
--- a/dvb-t/fi-Lahti
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Lapua b/dvb-t/fi-Lapua
deleted file mode 100644
index 77adecc2..00000000
--- a/dvb-t/fi-Lapua
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Laukaa b/dvb-t/fi-Laukaa
deleted file mode 100644
index a85ec1ec..00000000
--- a/dvb-t/fi-Laukaa
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Laukaa_Vihtavuori b/dvb-t/fi-Laukaa_Vihtavuori
deleted file mode 100644
index a85ec1ec..00000000
--- a/dvb-t/fi-Laukaa_Vihtavuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Lavia_Lavianjarvi b/dvb-t/fi-Lavia_Lavianjarvi
deleted file mode 100644
index b6e6dca7..00000000
--- a/dvb-t/fi-Lavia_Lavianjarvi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Lieksa_Konnanvaara b/dvb-t/fi-Lieksa_Konnanvaara
deleted file mode 100644
index c0ae1fd7..00000000
--- a/dvb-t/fi-Lieksa_Konnanvaara
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Lohja b/dvb-t/fi-Lohja
deleted file mode 100644
index 68287eed..00000000
--- a/dvb-t/fi-Lohja
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Loimaa b/dvb-t/fi-Loimaa
deleted file mode 100644
index 6f77040d..00000000
--- a/dvb-t/fi-Loimaa
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Luhanka b/dvb-t/fi-Luhanka
deleted file mode 100644
index 0c3a70e4..00000000
--- a/dvb-t/fi-Luhanka
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Luopioinen b/dvb-t/fi-Luopioinen
deleted file mode 100644
index 74191d03..00000000
--- a/dvb-t/fi-Luopioinen
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Mantta b/dvb-t/fi-Mantta
deleted file mode 100644
index 561e3c47..00000000
--- a/dvb-t/fi-Mantta
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Mantyharju b/dvb-t/fi-Mantyharju
deleted file mode 100644
index 8ed12f1c..00000000
--- a/dvb-t/fi-Mantyharju
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Mikkeli b/dvb-t/fi-Mikkeli
deleted file mode 100644
index c3a9f91d..00000000
--- a/dvb-t/fi-Mikkeli
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Muonio_Olostunturi b/dvb-t/fi-Muonio_Olostunturi
deleted file mode 100644
index 5750553c..00000000
--- a/dvb-t/fi-Muonio_Olostunturi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Mustasaari b/dvb-t/fi-Mustasaari
deleted file mode 100644
index e73d1d14..00000000
--- a/dvb-t/fi-Mustasaari
+++ /dev/null
@@ -1,3 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Myllylahti b/dvb-t/fi-Myllylahti
deleted file mode 100644
index 8c808959..00000000
--- a/dvb-t/fi-Myllylahti
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nilsia b/dvb-t/fi-Nilsia
deleted file mode 100644
index 4c5994e7..00000000
--- a/dvb-t/fi-Nilsia
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nilsia_Keski-Siikajarvi b/dvb-t/fi-Nilsia_Keski-Siikajarvi
deleted file mode 100644
index b09c019e..00000000
--- a/dvb-t/fi-Nilsia_Keski-Siikajarvi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nilsia_Pisa b/dvb-t/fi-Nilsia_Pisa
deleted file mode 100644
index b14bbbb6..00000000
--- a/dvb-t/fi-Nilsia_Pisa
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nokia b/dvb-t/fi-Nokia
deleted file mode 100644
index dab2feb0..00000000
--- a/dvb-t/fi-Nokia
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nokia_Siuro_Linnavuori b/dvb-t/fi-Nokia_Siuro_Linnavuori
deleted file mode 100644
index dab2feb0..00000000
--- a/dvb-t/fi-Nokia_Siuro_Linnavuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nummi-Pusula_Hyonola b/dvb-t/fi-Nummi-Pusula_Hyonola
deleted file mode 100644
index 3953482e..00000000
--- a/dvb-t/fi-Nummi-Pusula_Hyonola
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Nurmes_Kortevaara b/dvb-t/fi-Nurmes_Kortevaara
deleted file mode 100644
index 130a6be1..00000000
--- a/dvb-t/fi-Nurmes_Kortevaara
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Orivesi_Langelmaki_Talviainen b/dvb-t/fi-Orivesi_Langelmaki_Talviainen
deleted file mode 100644
index 1f34e37a..00000000
--- a/dvb-t/fi-Orivesi_Langelmaki_Talviainen
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Oulu b/dvb-t/fi-Oulu
deleted file mode 100644
index e0b88dac..00000000
--- a/dvb-t/fi-Oulu
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Padasjoki b/dvb-t/fi-Padasjoki
deleted file mode 100644
index 23f3b299..00000000
--- a/dvb-t/fi-Padasjoki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Padasjoki_Arrakoski b/dvb-t/fi-Padasjoki_Arrakoski
deleted file mode 100644
index e848d264..00000000
--- a/dvb-t/fi-Padasjoki_Arrakoski
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Paltamo_Kivesvaara b/dvb-t/fi-Paltamo_Kivesvaara
deleted file mode 100644
index ca2c8af6..00000000
--- a/dvb-t/fi-Paltamo_Kivesvaara
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Parikkala b/dvb-t/fi-Parikkala
deleted file mode 100644
index 50d5cd6e..00000000
--- a/dvb-t/fi-Parikkala
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Parkano_Sopukallio b/dvb-t/fi-Parkano_Sopukallio
deleted file mode 100644
index 3b1f1ef7..00000000
--- a/dvb-t/fi-Parkano_Sopukallio
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pello b/dvb-t/fi-Pello
deleted file mode 100644
index 834dc84b..00000000
--- a/dvb-t/fi-Pello
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pello_Ratasvaara b/dvb-t/fi-Pello_Ratasvaara
deleted file mode 100644
index 62559115..00000000
--- a/dvb-t/fi-Pello_Ratasvaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Perho b/dvb-t/fi-Perho
deleted file mode 100644
index 4afc01b8..00000000
--- a/dvb-t/fi-Perho
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pernaja b/dvb-t/fi-Pernaja
deleted file mode 100644
index d63da78e..00000000
--- a/dvb-t/fi-Pernaja
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pieksamaki_Halkokumpu b/dvb-t/fi-Pieksamaki_Halkokumpu
deleted file mode 100644
index a7613962..00000000
--- a/dvb-t/fi-Pieksamaki_Halkokumpu
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pihtipudas b/dvb-t/fi-Pihtipudas
deleted file mode 100644
index 30baf95f..00000000
--- a/dvb-t/fi-Pihtipudas
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Porvoo_Suomenkyla b/dvb-t/fi-Porvoo_Suomenkyla
deleted file mode 100644
index 2b4b8f82..00000000
--- a/dvb-t/fi-Porvoo_Suomenkyla
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Posio b/dvb-t/fi-Posio
deleted file mode 100644
index 80668482..00000000
--- a/dvb-t/fi-Posio
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pudasjarvi b/dvb-t/fi-Pudasjarvi
deleted file mode 100644
index fd93b50e..00000000
--- a/dvb-t/fi-Pudasjarvi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pudasjarvi_Hirvaskoski b/dvb-t/fi-Pudasjarvi_Hirvaskoski
deleted file mode 100644
index a550248f..00000000
--- a/dvb-t/fi-Pudasjarvi_Hirvaskoski
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pudasjarvi_Iso-Syote b/dvb-t/fi-Pudasjarvi_Iso-Syote
deleted file mode 100644
index 875af2f2..00000000
--- a/dvb-t/fi-Pudasjarvi_Iso-Syote
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Puolanka b/dvb-t/fi-Puolanka
deleted file mode 100644
index 5d85ca52..00000000
--- a/dvb-t/fi-Puolanka
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pyhatunturi b/dvb-t/fi-Pyhatunturi
deleted file mode 100644
index 7f586e63..00000000
--- a/dvb-t/fi-Pyhatunturi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pyhavuori b/dvb-t/fi-Pyhavuori
deleted file mode 100644
index 3d7adb93..00000000
--- a/dvb-t/fi-Pyhavuori
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Pylkonmaki_Karankajarvi b/dvb-t/fi-Pylkonmaki_Karankajarvi
deleted file mode 100644
index de37e88b..00000000
--- a/dvb-t/fi-Pylkonmaki_Karankajarvi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Raahe_Mestauskallio b/dvb-t/fi-Raahe_Mestauskallio
deleted file mode 100644
index 498542c9..00000000
--- a/dvb-t/fi-Raahe_Mestauskallio
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Raahe_Piehinki b/dvb-t/fi-Raahe_Piehinki
deleted file mode 100644
index a0e7e7a2..00000000
--- a/dvb-t/fi-Raahe_Piehinki
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ranua_Haasionmaa b/dvb-t/fi-Ranua_Haasionmaa
deleted file mode 100644
index a74bca78..00000000
--- a/dvb-t/fi-Ranua_Haasionmaa
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ranua_Leppiaho b/dvb-t/fi-Ranua_Leppiaho
deleted file mode 100644
index ad2e920d..00000000
--- a/dvb-t/fi-Ranua_Leppiaho
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rautavaara_Angervikko b/dvb-t/fi-Rautavaara_Angervikko
deleted file mode 100644
index 63490731..00000000
--- a/dvb-t/fi-Rautavaara_Angervikko
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rautjarvi_Simpele b/dvb-t/fi-Rautjarvi_Simpele
deleted file mode 100644
index e515554f..00000000
--- a/dvb-t/fi-Rautjarvi_Simpele
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ristijarvi b/dvb-t/fi-Ristijarvi
deleted file mode 100644
index 65ee42db..00000000
--- a/dvb-t/fi-Ristijarvi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi b/dvb-t/fi-Rovaniemi
deleted file mode 100644
index e3b96b3b..00000000
--- a/dvb-t/fi-Rovaniemi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Ala-Nampa_Yli-Nampa_Rantalaki b/dvb-t/fi-Rovaniemi_Ala-Nampa_Yli-Nampa_Rantalaki
deleted file mode 100644
index 43dd796a..00000000
--- a/dvb-t/fi-Rovaniemi_Ala-Nampa_Yli-Nampa_Rantalaki
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Kaihuanvaara b/dvb-t/fi-Rovaniemi_Kaihuanvaara
deleted file mode 100644
index a0567ed6..00000000
--- a/dvb-t/fi-Rovaniemi_Kaihuanvaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Marasenkallio b/dvb-t/fi-Rovaniemi_Marasenkallio
deleted file mode 100644
index 9dbb40d2..00000000
--- a/dvb-t/fi-Rovaniemi_Marasenkallio
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Marrasjarvi b/dvb-t/fi-Rovaniemi_Marrasjarvi
deleted file mode 100644
index fd29f57c..00000000
--- a/dvb-t/fi-Rovaniemi_Marrasjarvi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Meltaus_Sorviselka b/dvb-t/fi-Rovaniemi_Meltaus_Sorviselka
deleted file mode 100644
index 43dd796a..00000000
--- a/dvb-t/fi-Rovaniemi_Meltaus_Sorviselka
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Rovaniemi_Sonka b/dvb-t/fi-Rovaniemi_Sonka
deleted file mode 100644
index 9dbb40d2..00000000
--- a/dvb-t/fi-Rovaniemi_Sonka
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ruka b/dvb-t/fi-Ruka
deleted file mode 100644
index f036154c..00000000
--- a/dvb-t/fi-Ruka
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ruovesi_Storminiemi b/dvb-t/fi-Ruovesi_Storminiemi
deleted file mode 100644
index 408e9d44..00000000
--- a/dvb-t/fi-Ruovesi_Storminiemi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Saarijarvi b/dvb-t/fi-Saarijarvi
deleted file mode 100644
index a5a503bd..00000000
--- a/dvb-t/fi-Saarijarvi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Saarijarvi_Kalmari b/dvb-t/fi-Saarijarvi_Kalmari
deleted file mode 100644
index de37e88b..00000000
--- a/dvb-t/fi-Saarijarvi_Kalmari
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Saarijarvi_Mahlu b/dvb-t/fi-Saarijarvi_Mahlu
deleted file mode 100644
index 263c6e32..00000000
--- a/dvb-t/fi-Saarijarvi_Mahlu
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salla_Hirvasvaara b/dvb-t/fi-Salla_Hirvasvaara
deleted file mode 100644
index cae406aa..00000000
--- a/dvb-t/fi-Salla_Hirvasvaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salla_Ihistysjanka b/dvb-t/fi-Salla_Ihistysjanka
deleted file mode 100644
index 42276ada..00000000
--- a/dvb-t/fi-Salla_Ihistysjanka
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salla_Naruska b/dvb-t/fi-Salla_Naruska
deleted file mode 100644
index c07f5966..00000000
--- a/dvb-t/fi-Salla_Naruska
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salla_Sallatunturi b/dvb-t/fi-Salla_Sallatunturi
deleted file mode 100644
index a6d3546f..00000000
--- a/dvb-t/fi-Salla_Sallatunturi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salla_Sarivaara b/dvb-t/fi-Salla_Sarivaara
deleted file mode 100644
index a6d3546f..00000000
--- a/dvb-t/fi-Salla_Sarivaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Salo_Isokyla b/dvb-t/fi-Salo_Isokyla
deleted file mode 100644
index 9a8e7c5e..00000000
--- a/dvb-t/fi-Salo_Isokyla
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Savukoski_Martti b/dvb-t/fi-Savukoski_Martti
deleted file mode 100644
index 8af05b66..00000000
--- a/dvb-t/fi-Savukoski_Martti
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Savukoski_Tanhua b/dvb-t/fi-Savukoski_Tanhua
deleted file mode 100644
index 817b1d48..00000000
--- a/dvb-t/fi-Savukoski_Tanhua
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Siilinjarvi b/dvb-t/fi-Siilinjarvi
deleted file mode 100644
index c8ef6dff..00000000
--- a/dvb-t/fi-Siilinjarvi
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Sipoo_Norrkulla b/dvb-t/fi-Sipoo_Norrkulla
deleted file mode 100644
index dcc9e4c3..00000000
--- a/dvb-t/fi-Sipoo_Norrkulla
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Sodankyla_Pittiovaara b/dvb-t/fi-Sodankyla_Pittiovaara
deleted file mode 100644
index cb87094c..00000000
--- a/dvb-t/fi-Sodankyla_Pittiovaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Sulkava_Vaatalanmaki b/dvb-t/fi-Sulkava_Vaatalanmaki
deleted file mode 100644
index 30982d51..00000000
--- a/dvb-t/fi-Sulkava_Vaatalanmaki
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Sysma_Liikola b/dvb-t/fi-Sysma_Liikola
deleted file mode 100644
index 5a5803d6..00000000
--- a/dvb-t/fi-Sysma_Liikola
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Taivalkoski b/dvb-t/fi-Taivalkoski
deleted file mode 100644
index f62c9b71..00000000
--- a/dvb-t/fi-Taivalkoski
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Taivalkoski_Taivalvaara b/dvb-t/fi-Taivalkoski_Taivalvaara
deleted file mode 100644
index d166ea6d..00000000
--- a/dvb-t/fi-Taivalkoski_Taivalvaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Tammela b/dvb-t/fi-Tammela
deleted file mode 100644
index b1711a68..00000000
--- a/dvb-t/fi-Tammela
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Tammisaari b/dvb-t/fi-Tammisaari
deleted file mode 100644
index 832a3f28..00000000
--- a/dvb-t/fi-Tammisaari
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Tampere b/dvb-t/fi-Tampere
deleted file mode 100644
index 408e9d44..00000000
--- a/dvb-t/fi-Tampere
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Tampere_Pyynikki b/dvb-t/fi-Tampere_Pyynikki
deleted file mode 100644
index c627058c..00000000
--- a/dvb-t/fi-Tampere_Pyynikki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Tervola b/dvb-t/fi-Tervola
deleted file mode 100644
index a57e255e..00000000
--- a/dvb-t/fi-Tervola
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Turku b/dvb-t/fi-Turku
index 187d6189..5f2d9b43 100644
--- a/dvb-t/fi-Turku
+++ b/dvb-t/fi-Turku
@@ -1,6 +1,3 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
+# Turku A-mux (Digita Finland)
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki b/dvb-t/fi-Utsjoki
deleted file mode 100644
index e216a814..00000000
--- a/dvb-t/fi-Utsjoki
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Nuorgam_Njallavaara b/dvb-t/fi-Utsjoki_Nuorgam_Njallavaara
deleted file mode 100644
index 7615f115..00000000
--- a/dvb-t/fi-Utsjoki_Nuorgam_Njallavaara
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Nuorgam_raja b/dvb-t/fi-Utsjoki_Nuorgam_raja
deleted file mode 100644
index 7615f115..00000000
--- a/dvb-t/fi-Utsjoki_Nuorgam_raja
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Nuvvus b/dvb-t/fi-Utsjoki_Nuvvus
deleted file mode 100644
index c6028c48..00000000
--- a/dvb-t/fi-Utsjoki_Nuvvus
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Outakoski b/dvb-t/fi-Utsjoki_Outakoski
deleted file mode 100644
index 76dece6b..00000000
--- a/dvb-t/fi-Utsjoki_Outakoski
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Polvarniemi b/dvb-t/fi-Utsjoki_Polvarniemi
deleted file mode 100644
index 76dece6b..00000000
--- a/dvb-t/fi-Utsjoki_Polvarniemi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Rovisuvanto b/dvb-t/fi-Utsjoki_Rovisuvanto
deleted file mode 100644
index f3f2e817..00000000
--- a/dvb-t/fi-Utsjoki_Rovisuvanto
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Utsjoki_Tenola b/dvb-t/fi-Utsjoki_Tenola
deleted file mode 100644
index 7dfd61ac..00000000
--- a/dvb-t/fi-Utsjoki_Tenola
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Uusikaupunki_Orivo b/dvb-t/fi-Uusikaupunki_Orivo
deleted file mode 100644
index 53bb6535..00000000
--- a/dvb-t/fi-Uusikaupunki_Orivo
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vaajakoski b/dvb-t/fi-Vaajakoski
deleted file mode 100644
index ccab5569..00000000
--- a/dvb-t/fi-Vaajakoski
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vaala b/dvb-t/fi-Vaala
deleted file mode 100644
index 2e8851e0..00000000
--- a/dvb-t/fi-Vaala
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vaasa b/dvb-t/fi-Vaasa
deleted file mode 100644
index 1e878fd8..00000000
--- a/dvb-t/fi-Vaasa
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Valtimo b/dvb-t/fi-Valtimo
deleted file mode 100644
index 73281437..00000000
--- a/dvb-t/fi-Valtimo
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vammala_Jyranvuori b/dvb-t/fi-Vammala_Jyranvuori
deleted file mode 100644
index 8753665b..00000000
--- a/dvb-t/fi-Vammala_Jyranvuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vammala_Roismala b/dvb-t/fi-Vammala_Roismala
deleted file mode 100644
index 8c9a0e37..00000000
--- a/dvb-t/fi-Vammala_Roismala
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vammala_Savi b/dvb-t/fi-Vammala_Savi
deleted file mode 100644
index fd4b3b4e..00000000
--- a/dvb-t/fi-Vammala_Savi
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vantaa_Hakunila b/dvb-t/fi-Vantaa_Hakunila
deleted file mode 100644
index 2764c44b..00000000
--- a/dvb-t/fi-Vantaa_Hakunila
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Varpaisjarvi_Honkamaki b/dvb-t/fi-Varpaisjarvi_Honkamaki
deleted file mode 100644
index afa98023..00000000
--- a/dvb-t/fi-Varpaisjarvi_Honkamaki
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Virrat_Lappavuori b/dvb-t/fi-Virrat_Lappavuori
deleted file mode 100644
index f39307d7..00000000
--- a/dvb-t/fi-Virrat_Lappavuori
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vuokatti b/dvb-t/fi-Vuokatti
deleted file mode 100644
index 382b91ed..00000000
--- a/dvb-t/fi-Vuokatti
+++ /dev/null
@@ -1,6 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Vuotso b/dvb-t/fi-Vuotso
deleted file mode 100644
index 111d043e..00000000
--- a/dvb-t/fi-Vuotso
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ylitornio_Ainiovaara b/dvb-t/fi-Ylitornio_Ainiovaara
deleted file mode 100644
index 9edae156..00000000
--- a/dvb-t/fi-Ylitornio_Ainiovaara
+++ /dev/null
@@ -1,5 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Ylitornio_Raanujarvi b/dvb-t/fi-Ylitornio_Raanujarvi
deleted file mode 100644
index 7380a749..00000000
--- a/dvb-t/fi-Ylitornio_Raanujarvi
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fi-Yllas b/dvb-t/fi-Yllas
deleted file mode 100644
index 834dc84b..00000000
--- a/dvb-t/fi-Yllas
+++ /dev/null
@@ -1,4 +0,0 @@
-# automatically generated from http://www.digitv.fi/sivu.asp?path=1;8224;9519
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/fr-Bordeaux b/dvb-t/fr-Bordeaux
deleted file mode 100644
index 5efba4ed..00000000
--- a/dvb-t/fr-Bordeaux
+++ /dev/null
@@ -1,9 +0,0 @@
-# Bordeaux - France (DVB-T transmitter of Bouliac or Cauderan)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/gr-Athens b/dvb-t/gr-Athens
deleted file mode 100644
index f683333d..00000000
--- a/dvb-t/gr-Athens
+++ /dev/null
@@ -1,5 +0,0 @@
-# Initial scan config for Digital DVB-T (Ert) in Athens Greece
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Digea DVB-T
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Digea DVB-T
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hk-HongKong b/dvb-t/hk-HongKong
deleted file mode 100644
index 4c332ffb..00000000
--- a/dvb-t/hk-HongKong
+++ /dev/null
@@ -1,18 +0,0 @@
-# Hong Kong (DMB-TH)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# TVB (band 35)
-T 586000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-# ATV (band 37)
-T 602000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-
-# Simulcast (band 22)
-T 482000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-# Simulcast (band 30)
-T 546000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-# Simulcast (band 32)
-T 562000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-# Simulcast (band 40)
-T 628000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
-# Simulcast (band 43)
-T 650000000 8MHz AUTO NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/hr-All b/dvb-t/hr-All
deleted file mode 100644
index 6561858a..00000000
--- a/dvb-t/hr-All
+++ /dev/null
@@ -1,30 +0,0 @@
-# Croatia, whole country
-# Created from http://www.oiv.hr/broadcasting/tables/dtv_hr.aspx
-# and from http://www.oiv.hr/broadcasting/tables/dtv_channel_hr.aspx
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D1 MUXD
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXA
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D4 MUXA
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXA, D9 MUXD
-T 538000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 538000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d72 MUXD
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXA
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXD
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXA
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D8 MUXD
-T 586000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # d71 MUXD
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXD
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXA
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXB
-T 642000000 8MHz 5/6 NONE QAM64 8k 1/4 NONE # D4 MUXD
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D1 MUXB, D3 MUXA, D6 MUXB
-T 666000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MUXD
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SLO MUXA
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D3 MUXB, D4 MUXB
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXA, D9 MUXA
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D5 MUXB, D8 MUXB
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D6 MUXD
-T 762000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE # Tusti Vrh MUXD
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D2 MUXD
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE # D7 MUXB, D9 MUXB
-T 850000000 8MHz 5/6 NONE QAM64 8k 1/16 NONE # D5 MFN
diff --git a/dvb-t/hu-Bekescsaba b/dvb-t/hu-Bekescsaba
deleted file mode 100644
index e9061118..00000000
--- a/dvb-t/hu-Bekescsaba
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Bekescsaba
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-54:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 738000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-65:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Budapest b/dvb-t/hu-Budapest
deleted file mode 100644
index 09796a95..00000000
--- a/dvb-t/hu-Budapest
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Budapest
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-55:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-62:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Csavoly-Kiskoros b/dvb-t/hu-Csavoly-Kiskoros
deleted file mode 100644
index 80917980..00000000
--- a/dvb-t/hu-Csavoly-Kiskoros
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Csavoly-Kiskoros
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-45:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-68:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Gerecse b/dvb-t/hu-Gerecse
deleted file mode 100644
index ee8a0c47..00000000
--- a/dvb-t/hu-Gerecse
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Gerecse
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-64:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-63:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Gyor-Tatabanya b/dvb-t/hu-Gyor-Tatabanya
deleted file mode 100644
index 3ed9bdf4..00000000
--- a/dvb-t/hu-Gyor-Tatabanya
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Gyor-Tatabanya
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-42:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-61:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Kabhegy-Mor-Siofok b/dvb-t/hu-Kabhegy-Mor-Siofok
deleted file mode 100644
index 706a1348..00000000
--- a/dvb-t/hu-Kabhegy-Mor-Siofok
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Kabhegy-Mor-Siofok
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-64:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-61:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Karcag b/dvb-t/hu-Karcag
deleted file mode 100644
index 9c2b909b..00000000
--- a/dvb-t/hu-Karcag
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Karcag
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-46:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-64:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Kekes-Ozd b/dvb-t/hu-Kekes-Ozd
deleted file mode 100644
index a9436526..00000000
--- a/dvb-t/hu-Kekes-Ozd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Kekes-Ozd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-44:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 658000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-69:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 858000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Kiskoros b/dvb-t/hu-Kiskoros
deleted file mode 100644
index 82cc97e8..00000000
--- a/dvb-t/hu-Kiskoros
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Kiskoros
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-45:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-68:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Komadi-Debrecen b/dvb-t/hu-Komadi-Debrecen
deleted file mode 100644
index 12f903eb..00000000
--- a/dvb-t/hu-Komadi-Debrecen
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Debrecen-Komadi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-46:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-62:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Nagykanizsa-Kaposvar b/dvb-t/hu-Nagykanizsa-Kaposvar
deleted file mode 100644
index 7a7c24fb..00000000
--- a/dvb-t/hu-Nagykanizsa-Kaposvar
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Kaposvar-Nagykanizsa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-24:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-65:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Pecs-Uzd b/dvb-t/hu-Pecs-Uzd
deleted file mode 100644
index 188711b8..00000000
--- a/dvb-t/hu-Pecs-Uzd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Pecs-Uzd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-52:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-67:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 842000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Salgotarjan b/dvb-t/hu-Salgotarjan
deleted file mode 100644
index dbd48709..00000000
--- a/dvb-t/hu-Salgotarjan
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Salgotarjan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-55:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-62:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 802000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Sopron b/dvb-t/hu-Sopron
deleted file mode 100644
index 07b1037b..00000000
--- a/dvb-t/hu-Sopron
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Sopron
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-42:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-68:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Szentes-Szeged b/dvb-t/hu-Szentes-Szeged
deleted file mode 100644
index 864c1b99..00000000
--- a/dvb-t/hu-Szentes-Szeged
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Szentes-Szeged
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-60:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-65:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Tokaj-Kazincbarcika b/dvb-t/hu-Tokaj-Kazincbarcika
deleted file mode 100644
index 14352711..00000000
--- a/dvb-t/hu-Tokaj-Kazincbarcika
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Tokaj-Kazincbarcika
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-68:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-63:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 810000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/hu-Vasvar b/dvb-t/hu-Vasvar
deleted file mode 100644
index a889d9c4..00000000
--- a/dvb-t/hu-Vasvar
+++ /dev/null
@@ -1,17 +0,0 @@
-# Hungary / Vasvar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# A.multiplex UHF-58:
-# FREE --------------------------------------------------------------------------------
-# m1 HD, m2 HD, RTL Klub, TV2, Euronews EN Teszt, Euronews FR Teszt, Euronews GER Teszt
-# Radio DVB-T Teszt 1, Radio DVB-T Teszt 2,Radio DVB-T Teszt 3
-# NON-FREE ----------------------------------------------------------------------------
-# ATV, HirTV
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-#
-# C.multiplex UHF-68:
-# FREE --------------------------------------------------------------------------------
-# DunaTV HD, Autonomia
-# NON-FREE ----------------------------------------------------------------------------
-# Cool, Film+, Sportklub, National Geographic, Disney, AXN, FEM3, Private spice
-T 850000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/il-All b/dvb-t/il-All
deleted file mode 100644
index 3a74a6ca..00000000
--- a/dvb-t/il-All
+++ /dev/null
@@ -1,5 +0,0 @@
-# Israel, Israel Broadcasting Authority's transmitters
-# Generated from list in http://www.iba.org.il/reception/
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/ir-Tehran b/dvb-t/ir-Tehran
deleted file mode 100644
index d9ec5ad0..00000000
--- a/dvb-t/ir-Tehran
+++ /dev/null
@@ -1,4 +0,0 @@
-# DVB-T Tehran
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # IRIB-TV1/2/3/4/5, IRINN, AMOUZESH, QURAN-TV
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # PRESS TV, AL-ALAM, AL-KOUSAR, JAAMEJAM 1, IRIB MOSTANAD, IRIB OSTANI
diff --git a/dvb-t/is-Reykjavik b/dvb-t/is-Reykjavik
deleted file mode 100644
index 8d3f039e..00000000
--- a/dvb-t/is-Reykjavik
+++ /dev/null
@@ -1,29 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20100316 1 0 OFDM IS </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: <add description here>
-# date (yyyy-mm-dd) : 2010-10-22
-# provided by (opt) : <your name or email here>
-#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#------------------------------------------------------------------------------
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Vodafone
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 770000000 8MHz 1/2 NONE QAM64 2k 1/32 NONE # Vodafone
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 738000000 8MHz 1/2 NONE QPSK 2k 1/32 NONE # Vodafone
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # Vodafone
diff --git a/dvb-t/it-Aosta b/dvb-t/it-Aosta
deleted file mode 100644
index 28c32ae9..00000000
--- a/dvb-t/it-Aosta
+++ /dev/null
@@ -1,21 +0,0 @@
-# Italia / Aosta (it-Aosta) -- mailto: Marco <lovebuzz@email.it>
-#
-# A me funziona solo il Mux Mediaset 2 non riesco a capire come mai...
-# (magari colpa della mia pinnacle pctv 301i saa7133)
-# Gli altri Mux inseriti li ho inseriti come da sito http://www.digitv.it...
-#
-# Chi avesse news o riuscisse a venirne a capo usando anche gli altri mux potrebbe scrivermi
-# inviare una maila kaffeine-user@lists.sf.net per aggiornare/correggere questo file...
-#
-# MUX-A RAI
-T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bari b/dvb-t/it-Bari
deleted file mode 100644
index efcc8523..00000000
--- a/dvb-t/it-Bari
+++ /dev/null
@@ -1,18 +0,0 @@
-# Italy, Bari
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TeleNorba, TelePuglia, altro...
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bologna b/dvb-t/it-Bologna
deleted file mode 100644
index 8f5a1360..00000000
--- a/dvb-t/it-Bologna
+++ /dev/null
@@ -1,28 +0,0 @@
-# DVB-T Collserola (Barcelona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#TeleSanterno
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#RaiA
-T 203500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Sestarete / Rete 7
-T 212500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Modena
-T 219500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#ReteA, Camera e Senato
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Sestarete / Rete 7
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#DFree
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mediaset Mux-B
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#La7
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#RaiB
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mediaset Mux-A
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#TeleSanterno
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#LA7-2
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Bolzano b/dvb-t/it-Bolzano
deleted file mode 100644
index f4a8e9b1..00000000
--- a/dvb-t/it-Bolzano
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Bolzano
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-#RAS DVB-t NETWORK
-T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/it-Cagliari b/dvb-t/it-Cagliari
deleted file mode 100644
index 2cfb4c19..00000000
--- a/dvb-t/it-Cagliari
+++ /dev/null
@@ -1,23 +0,0 @@
-# DVB-T Cagliari
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 205500000 7MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 562000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Caivano b/dvb-t/it-Caivano
deleted file mode 100644
index 86a98475..00000000
--- a/dvb-t/it-Caivano
+++ /dev/null
@@ -1,17 +0,0 @@
-# DVB-T Caivano (Naples) 80023
-# 30/10/2008 by Nicola Costanzo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX LA7/MTV
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMB1
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Catania b/dvb-t/it-Catania
deleted file mode 100644
index 20bacd66..00000000
--- a/dvb-t/it-Catania
+++ /dev/null
@@ -1,27 +0,0 @@
-# it-Catania
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX MEDIASET 1
-T 226500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX MEDIASET 2
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Conero b/dvb-t/it-Conero
deleted file mode 100644
index 2d481388..00000000
--- a/dvb-t/it-Conero
+++ /dev/null
@@ -1,8 +0,0 @@
-# Italia / Conero (it-Conero) -- mailto: simon <f.simon@email.it>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C50
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C46
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Firenze b/dvb-t/it-Firenze
deleted file mode 100644
index eca721a8..00000000
--- a/dvb-t/it-Firenze
+++ /dev/null
@@ -1,20 +0,0 @@
-# This channel list is made by Michele Ficarra
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MBON
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Digitoscana
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Tele37
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Genova b/dvb-t/it-Genova
deleted file mode 100644
index 5a1b6ddd..00000000
--- a/dvb-t/it-Genova
+++ /dev/null
@@ -1,12 +0,0 @@
-# Italia / Genova (it-Genova) - Angelo Conforti <angeloxx@angeloxx.it>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX Mediaset
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Livorno b/dvb-t/it-Livorno
deleted file mode 100644
index 075d8b4e..00000000
--- a/dvb-t/it-Livorno
+++ /dev/null
@@ -1,15 +0,0 @@
-# This channel list is made by G.U.L.LI. LIvorno's Linux Users Group
-# Thanks to: Alessandro Guarguaglini, Stefano Lenzi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Milano b/dvb-t/it-Milano
deleted file mode 100644
index a0a5da2e..00000000
--- a/dvb-t/it-Milano
+++ /dev/null
@@ -1,49 +0,0 @@
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 800000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A MEDIASET
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A MEDIASET-2
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MEDIASET LA 5
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE 2
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX RETE A
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX STUDIO1
-T 184500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX STUDIO NORD
-T 191500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX VIDEO STAR NOVARA
-T 219500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELENOVA
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELE 7 LAGHI
-T 495250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX VIDEO BERGAMO
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TELE MILANO
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# RETE 55
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELE LIBERTA'
-T 735250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# RSI
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELE COLOR PRIMARETE
-T 783250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELESTAR
-T 807250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TELECAMPIONE
-T 847250000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Modena b/dvb-t/it-Modena
deleted file mode 100644
index 56dd1066..00000000
--- a/dvb-t/it-Modena
+++ /dev/null
@@ -1,50 +0,0 @@
-# DVB-T Collserola (Barcelona)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#Mux 1 Rai
-T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 2 Rai
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 3 Rai
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux 4 Rai
-# T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 1
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 2
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Timb 3
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 1
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 2
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 4
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 5
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Mediaset 6
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Rete A 1
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux DFree
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Di. TV
-T 184500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux TV Rete 7
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Telestudio Modena
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Sesta Rete
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Trc Telemodena
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Canale Italia
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Telecentro Emilia Romagna
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Canale 24
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux VMT
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#Mux Nuovarete
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Montevergine b/dvb-t/it-Montevergine
deleted file mode 100644
index 0d7c30de..00000000
--- a/dvb-t/it-Montevergine
+++ /dev/null
@@ -1,18 +0,0 @@
-# DVB-T Montevergine (Avellino) 83100
-# 12/12/2009 by Antonio Galasso anto1714@libero.it
-# (ricordati di mettere il lettore in posizione stop orima di iniziare la scansione dei canali)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C-MUX
-T 177500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/it-Pagnacco b/dvb-t/it-Pagnacco
deleted file mode 100644
index c6f482dd..00000000
--- a/dvb-t/it-Pagnacco
+++ /dev/null
@@ -1,27 +0,0 @@
-# Italia / Pagnacco (it-Pagnacco)
-# DVB-T Pagnacco (Italia)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# MUX-A RAI
-
-T 602000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI
-
-T 490000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 226500000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-Dfree
-
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# MUX-LA7/MTV
-
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# Mediaset
-
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/32 NONE
-
-# Europa
diff --git a/dvb-t/it-Palermo b/dvb-t/it-Palermo
deleted file mode 100644
index e3755659..00000000
--- a/dvb-t/it-Palermo
+++ /dev/null
@@ -1,23 +0,0 @@
-# Palermo, Italy
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
-#T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX MEDIASET 2
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Pescara b/dvb-t/it-Pescara
deleted file mode 100644
index 1c896463..00000000
--- a/dvb-t/it-Pescara
+++ /dev/null
@@ -1,15 +0,0 @@
-# Italy, Pescara San Silvestro
-# Antonio de Vincentiis, www.devincentiis.it, Montesilvano (PE)
-# update 06.02.2009
-# MUX-A RAI canale: VHF-E polarizzazione: O
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI canale: VHF-F polarizzazione: O
-T 194500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1 canale: UHF-69 polarizzazione: V
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE canale: UHF-56 polarizzazione: V
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2 canale: UHF-49 polarizzazione: V
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE canale: UHF-34 polarizzazione: V
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Pisa b/dvb-t/it-Pisa
deleted file mode 100644
index 8723d99e..00000000
--- a/dvb-t/it-Pisa
+++ /dev/null
@@ -1,18 +0,0 @@
-# This channel list is made by G.U.L.LI. LIvorno's Linux Users Group
-# Thanks to: Alessandro Guarguaglini, Stefano Lenzi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX-A RAI
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MBONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX TIMB1
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Roma b/dvb-t/it-Roma
deleted file mode 100644
index 7e849009..00000000
--- a/dvb-t/it-Roma
+++ /dev/null
@@ -1,16 +0,0 @@
-# DVB-T Roma
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX DFREE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX La7/MTV
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 1
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET 2
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 186000000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# SUPER 3
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-S-Stefano_al_mare b/dvb-t/it-S-Stefano_al_mare
deleted file mode 100644
index 7dd0275f..00000000
--- a/dvb-t/it-S-Stefano_al_mare
+++ /dev/null
@@ -1,19 +0,0 @@
-#DVB Santo Stefano al mare (IM)
-#Aggiornato al 10/08/2008
-#Fonte: DGTVI.it
-#s-stefano@email.it
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#MUX-A RAI
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX-B RAI
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MEDIASET 1
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MEDIASET 2
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX MBONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX DFREE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#MUX TIMB 1
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Sassari b/dvb-t/it-Sassari
deleted file mode 100644
index 23ba8174..00000000
--- a/dvb-t/it-Sassari
+++ /dev/null
@@ -1,33 +0,0 @@
-# DVB-T Sassari Channels List by frippertronics@alice.it ;)
-# MUX DFREE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX LA7/MTV
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET1
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX MEDIASET2
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-A RAI
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX-B RAI
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 858000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MBONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TCS
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# VIDEOLINA
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMEDIA MUX A
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# TIMEDIA MUX B
-T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# T 177500000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# SUPER TV
-# T 650000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Torino b/dvb-t/it-Torino
deleted file mode 100644
index 4587a213..00000000
--- a/dvb-t/it-Torino
+++ /dev/null
@@ -1,13 +0,0 @@
-# DVB-T Torino (Italia)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#MUX-A RAI
-T 834000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX-B RAI
-T 514000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX RTI
-T 474000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX LA7
-T 850000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-#MUX DFREE
-T 650000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/it-Trieste b/dvb-t/it-Trieste
deleted file mode 100644
index 0f92785a..00000000
--- a/dvb-t/it-Trieste
+++ /dev/null
@@ -1,23 +0,0 @@
-# Trieste, Italy
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# MUX MEDIASET 1 (Class News, 24Ore TV, Coming soon, BBC World, Boing, Mediaset Premium)
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX-B RAI (Rai Doc-Futura, RaiSportSAT, RaiNotizie24, Rai EDU1, Sat2000, Radio1, Radio2, Radio3, FDAuditorium)
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX-A RAI (Rai Uno, Rai Due, Rai Tre, Rai Utile)
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX DFREE (Rete 4, Italia 1, Sportitalia, LCI / Prima, Si Live24)
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (All Music)
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (Triveneta)
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-#
-# MUX (La7 Telemarket Retecapri MTv italia Sitcom Uno)
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Varese b/dvb-t/it-Varese
deleted file mode 100644
index 7ee9bb5e..00000000
--- a/dvb-t/it-Varese
+++ /dev/null
@@ -1,16 +0,0 @@
-# Italia / Varese -- mailto: b.gabriele <gb.dvbch@dveprojects.com>
-#
-# From: http://www.dgtvi.it/copertura.aspx
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# MUX-A RAI VHF H2 226,5 O CAMPO DEI FIORI
-T 226500000 7MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX DFREE UHF C50 706 V CAMPO DEI FIORI
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX LA7-MTV UHF C37 602 V CAMPO DEI FIORI
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX RTI UHF C26 514 O CAMPO DEI FIORI PRIMA CAPPELLA
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# MUX RTI UHF C38 514 V CAMPO DEI FIORI ALBERGO
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Venezia b/dvb-t/it-Venezia
deleted file mode 100644
index af9f4a1d..00000000
--- a/dvb-t/it-Venezia
+++ /dev/null
@@ -1,19 +0,0 @@
-# Italia / Venzia (it-Venezia) -- mailto: Rob <rob.davis@libero.it>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-#
-# According to Eurosat 1/2006
-#
-# C50 - MediaSet
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C37 - Rai A - Doesn't work in Mestre though
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C23 -Rai B
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C64 DFree
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C65 La 7
-T 826000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C58 Mediaset 2
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C36 DFree
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/it-Verona b/dvb-t/it-Verona
deleted file mode 100644
index b7df9441..00000000
--- a/dvb-t/it-Verona
+++ /dev/null
@@ -1,19 +0,0 @@
-# Italia / Verona / Sommacampagna - 02/03/2009
-# Italia / Verona / Zevio - 28/02/2009
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# C26 - TIMB1
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C34 - Mux B Rai
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C41 - Mux DFree
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C54 - MBone
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C58 - Rete All Music
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C61 - Mux Mediaset 2
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C64 - Mux DFree
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-# C67 - Mediaset 1
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/lt-All b/dvb-t/lt-All
deleted file mode 100644
index daf2da2c..00000000
--- a/dvb-t/lt-All
+++ /dev/null
@@ -1,39 +0,0 @@
-# Lithuania, whole country
-# Created from http://www.skaitmenine.lt/lt/skaitmenine_tv_lietuvoje/antzemine_dvb_t.html
-# Created by baruse@gmail.com
-
-# LRTC I tinklas
-T 482000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 22
-T 514000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 26
-T 618000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 39
-T 658000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 44
-T 682000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 47
-T 762000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 57
-T 770000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 58
-T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
-T 794000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 61
-
-# LRTC II tinklas
-T 570000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 33
-T 610000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 38
-T 690000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 48
-T 738000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 54
-T 802000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 62
-T 810000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 63
-T 818000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 64
-
-# TEO LT I tinklas
-T 594000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 36
-T 706000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 50
-T 778000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 59
-T 826000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 65
-
-# TEO LT II tinklas
-T 474000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 21
-T 546000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 30
-T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
-#T 786000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 60
-
-# Vilniui bonusas
-T 602000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 37
-#T 730000000 8MHz AUTO NONE QAM64 8k 1/16 NONE # kanalas 53
diff --git a/dvb-t/lu-All b/dvb-t/lu-All
deleted file mode 100644
index aa30d7c9..00000000
--- a/dvb-t/lu-All
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVB-T Luxembourg [2007-11-18]
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 191500000 7MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 7 M6, RTL 8, LUXE.TV
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Kanal 24 club RTL, RTL TVI, plug TV, RTL 4, RTL 5, RTL 7
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # Kanal 27 RTL TeleLetz, 2 ten RTL
diff --git a/dvb-t/lv-Riga b/dvb-t/lv-Riga
deleted file mode 100644
index 98478e04..00000000
--- a/dvb-t/lv-Riga
+++ /dev/null
@@ -1,25 +0,0 @@
-# Latvia - Riga (lv-Riga)
-# Generated by Raimonds Cicans
-# UTF8 encoding
-
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# DLRTC
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # Weak signal! VÄjÅ¡ signÄls! Слабый Ñигнал!
-
-# Baltkom TV
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 658000000 8MHz 1/2 NONE QPSK 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 834000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-
-# WARNING!
-# Some applications detect incorrect guard-interval.
-
-# UZMANĪBU!
-# Dažas programmas nekorekti nosaka "guard-interval" parametru.
-
-# Ð’ÐИМÐÐИЕ!
-# Ðекоторые программы некорректно определÑÑŽÑ‚ параметр "guard-interval"
diff --git a/dvb-t/nl-All b/dvb-t/nl-All
deleted file mode 100644
index f8b2c614..00000000
--- a/dvb-t/nl-All
+++ /dev/null
@@ -1,42 +0,0 @@
-# The Netherlands, whole country
-# Created from http://radio-tv-nederland.nl/TV%20zenderlijst%20Nederland.xls
-# and http://radio-tv-nederland.nl/dvbt/dvbt-lokaal.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 482000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 546000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 690000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 706000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 722000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 826000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 850000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/no-Trondelag_Stjordal b/dvb-t/no-Trondelag_Stjordal
deleted file mode 100644
index a9dc4469..00000000
--- a/dvb-t/no-Trondelag_Stjordal
+++ /dev/null
@@ -1,7 +0,0 @@
-# Norway / Trondelag / Stjordal
-# modified according to data automatically generated by w_scan
-# free (nrk) channels are on 658000000
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/nz-AucklandInfill b/dvb-t/nz-AucklandInfill
deleted file mode 100644
index 08e572ff..00000000
--- a/dvb-t/nz-AucklandInfill
+++ /dev/null
@@ -1,10 +0,0 @@
-# Pinehill, Remuera, Sky Tower, Auckland Infill, Auckland NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 562000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-AucklandWaiatarua b/dvb-t/nz-AucklandWaiatarua
deleted file mode 100644
index 83c1be8b..00000000
--- a/dvb-t/nz-AucklandWaiatarua
+++ /dev/null
@@ -1,10 +0,0 @@
-# Waiatarua, Auckland NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 538000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Christchurch b/dvb-t/nz-Christchurch
deleted file mode 100644
index 794a0b91..00000000
--- a/dvb-t/nz-Christchurch
+++ /dev/null
@@ -1,10 +0,0 @@
-# Sugarloaf, Christchurch NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Dunedin b/dvb-t/nz-Dunedin
deleted file mode 100644
index ad199376..00000000
--- a/dvb-t/nz-Dunedin
+++ /dev/null
@@ -1,10 +0,0 @@
-# Mt Cargill, Dunedin NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Hamilton b/dvb-t/nz-Hamilton
deleted file mode 100644
index 6b44438e..00000000
--- a/dvb-t/nz-Hamilton
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hamilton Infill, Waikato NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 682000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-HawkesBayMtErin b/dvb-t/nz-HawkesBayMtErin
deleted file mode 100644
index aece9000..00000000
--- a/dvb-t/nz-HawkesBayMtErin
+++ /dev/null
@@ -1,10 +0,0 @@
-# Mt. Erin, Hawkes Bay NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-HawkesBayNapier b/dvb-t/nz-HawkesBayNapier
deleted file mode 100644
index cebd6676..00000000
--- a/dvb-t/nz-HawkesBayNapier
+++ /dev/null
@@ -1,10 +0,0 @@
-# Napier Infill, Hawkes Bay NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Manawatu b/dvb-t/nz-Manawatu
deleted file mode 100644
index eb641197..00000000
--- a/dvb-t/nz-Manawatu
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wharite, Manawatu NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Tauranga b/dvb-t/nz-Tauranga
deleted file mode 100644
index 3c3abce7..00000000
--- a/dvb-t/nz-Tauranga
+++ /dev/null
@@ -1,10 +0,0 @@
-# Kopukairua, Tauranga NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 698000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-Waikato b/dvb-t/nz-Waikato
deleted file mode 100644
index 6dd7c81b..00000000
--- a/dvb-t/nz-Waikato
+++ /dev/null
@@ -1,10 +0,0 @@
-# Te Aroha, Waikato NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 674000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-WellingtonInfill b/dvb-t/nz-WellingtonInfill
deleted file mode 100644
index 61042c4f..00000000
--- a/dvb-t/nz-WellingtonInfill
+++ /dev/null
@@ -1,10 +0,0 @@
-# Fitzherbert, Baxters Knob, Wellington infill, Wellington NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 714000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-WellingtonKaukau b/dvb-t/nz-WellingtonKaukau
deleted file mode 100644
index fa49dd6b..00000000
--- a/dvb-t/nz-WellingtonKaukau
+++ /dev/null
@@ -1,10 +0,0 @@
-# Kaukau, Wellington NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 690000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 778000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/nz-WellingtonNgarara b/dvb-t/nz-WellingtonNgarara
deleted file mode 100644
index 4fb34691..00000000
--- a/dvb-t/nz-WellingtonNgarara
+++ /dev/null
@@ -1,10 +0,0 @@
-# Ngarara, Wellington NZ
-#
-# Channel allocation details for NZ can be found at
-# http://en.wikipedia.org/wiki/Freeview_(New_Zealand)
-#
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/16 NONE
diff --git a/dvb-t/pl-Rzeszow b/dvb-t/pl-Rzeszow
deleted file mode 100644
index 561705e4..00000000
--- a/dvb-t/pl-Rzeszow
+++ /dev/null
@@ -1,3 +0,0 @@
-# Rzeszow / Sucha Gora, South-East Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/pl-Warszawa b/dvb-t/pl-Warszawa
deleted file mode 100644
index 6ea4bb64..00000000
--- a/dvb-t/pl-Warszawa
+++ /dev/null
@@ -1,10 +0,0 @@
-# location : PL Warszawa mazowieckie
-# date scanned : 2011-11-17
-#
-# T[2] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
-#T 538000000 8MHz AUTO AUTO AUTO AUTO AUTO AUTO # Polsat HD
-T 548000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE #
-T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # MUX2 (dotych. naziemne bez TVP)
-T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # TVN ND
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE # MUX3 (TVP)
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE #
diff --git a/dvb-t/pl-Wroclaw b/dvb-t/pl-Wroclaw
deleted file mode 100644
index d6b0f9b2..00000000
--- a/dvb-t/pl-Wroclaw
+++ /dev/null
@@ -1,3 +0,0 @@
-# Wroclaw / Zorawina, South-West Poland
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
diff --git a/dvb-t/ro-Bucharest b/dvb-t/ro-Bucharest
deleted file mode 100644
index fac0ca92..00000000
--- a/dvb-t/ro-Bucharest
+++ /dev/null
@@ -1,5 +0,0 @@
-# Romania / Bucharest
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM16 8k 1/16 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SRTV
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/16 NONE # SNR DVB-T
diff --git a/dvb-t/se-Alvdalen_Brunnsberg b/dvb-t/se-Alvdalen_Brunnsberg
deleted file mode 100644
index d9e5427e..00000000
--- a/dvb-t/se-Alvdalen_Brunnsberg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Älvdalen/Brunnsberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Alvdalsasen b/dvb-t/se-Alvdalsasen
deleted file mode 100644
index d291cf64..00000000
--- a/dvb-t/se-Alvdalsasen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Älvdalsåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Alvsbyn b/dvb-t/se-Alvsbyn
deleted file mode 100644
index 214928da..00000000
--- a/dvb-t/se-Alvsbyn
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Älvsbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Amot b/dvb-t/se-Amot
deleted file mode 100644
index f93453c9..00000000
--- a/dvb-t/se-Amot
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ã…mot
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ange_Snoberg b/dvb-t/se-Ange_Snoberg
deleted file mode 100644
index 661ec985..00000000
--- a/dvb-t/se-Ange_Snoberg
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Ånge/Snöberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Angebo b/dvb-t/se-Angebo
deleted file mode 100644
index ee67956a..00000000
--- a/dvb-t/se-Angebo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ängebo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Angelholm_Vegeholm b/dvb-t/se-Angelholm_Vegeholm
deleted file mode 100644
index fd79bf78..00000000
--- a/dvb-t/se-Angelholm_Vegeholm
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Ängelholm/Vegeholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Arvidsjaur_Jultrask b/dvb-t/se-Arvidsjaur_Jultrask
deleted file mode 100644
index 4b559b8e..00000000
--- a/dvb-t/se-Arvidsjaur_Jultrask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Arvidsjaur/Julträsk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Aspeboda b/dvb-t/se-Aspeboda
deleted file mode 100644
index 825b96b6..00000000
--- a/dvb-t/se-Aspeboda
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Aspeboda
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Atvidaberg b/dvb-t/se-Atvidaberg
deleted file mode 100644
index 37a7fade..00000000
--- a/dvb-t/se-Atvidaberg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Ã…tvidaberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Avesta_Krylbo b/dvb-t/se-Avesta_Krylbo
deleted file mode 100644
index e454a415..00000000
--- a/dvb-t/se-Avesta_Krylbo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Avesta/Krylbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Backefors b/dvb-t/se-Backefors
deleted file mode 100644
index d6814254..00000000
--- a/dvb-t/se-Backefors
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Bäckefors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 826000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Bankeryd b/dvb-t/se-Bankeryd
deleted file mode 100644
index 06faa37b..00000000
--- a/dvb-t/se-Bankeryd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Bankeryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bergsjo_Balleberget b/dvb-t/se-Bergsjo_Balleberget
deleted file mode 100644
index 0c952972..00000000
--- a/dvb-t/se-Bergsjo_Balleberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Bergsjö/Bålleberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bergvik b/dvb-t/se-Bergvik
deleted file mode 100644
index 327562db..00000000
--- a/dvb-t/se-Bergvik
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Bergvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bollebygd b/dvb-t/se-Bollebygd
deleted file mode 100644
index 155df13b..00000000
--- a/dvb-t/se-Bollebygd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Bollebygd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bollnas b/dvb-t/se-Bollnas
deleted file mode 100644
index 38eaf1b9..00000000
--- a/dvb-t/se-Bollnas
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Bollnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Boras_Dalsjofors b/dvb-t/se-Boras_Dalsjofors
deleted file mode 100644
index ea732123..00000000
--- a/dvb-t/se-Boras_Dalsjofors
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Borås/Dalsjöfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Boras_Sjobo b/dvb-t/se-Boras_Sjobo
deleted file mode 100644
index 9e1dfe22..00000000
--- a/dvb-t/se-Boras_Sjobo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Borås/Sjöbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Borlange_Idkerberget b/dvb-t/se-Borlange_Idkerberget
deleted file mode 100644
index e30e2989..00000000
--- a/dvb-t/se-Borlange_Idkerberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Borlänge/Idkerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Borlange_Nygardarna b/dvb-t/se-Borlange_Nygardarna
deleted file mode 100644
index c4caad92..00000000
--- a/dvb-t/se-Borlange_Nygardarna
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Borlänge/Nygårdarna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bottnaryd_Ryd b/dvb-t/se-Bottnaryd_Ryd
deleted file mode 100644
index 88545b48..00000000
--- a/dvb-t/se-Bottnaryd_Ryd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Bottnaryd/Ryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bromsebro b/dvb-t/se-Bromsebro
deleted file mode 100644
index 7dc23bc2..00000000
--- a/dvb-t/se-Bromsebro
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Brömsebro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Bruzaholm b/dvb-t/se-Bruzaholm
deleted file mode 100644
index d2d82b47..00000000
--- a/dvb-t/se-Bruzaholm
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Bruzaholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Byxelkrok b/dvb-t/se-Byxelkrok
deleted file mode 100644
index 280accda..00000000
--- a/dvb-t/se-Byxelkrok
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Byxelkrok
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Dadran b/dvb-t/se-Dadran
deleted file mode 100644
index 6d55531b..00000000
--- a/dvb-t/se-Dadran
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - DÃ¥dran
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Dalfors b/dvb-t/se-Dalfors
deleted file mode 100644
index b9f5c768..00000000
--- a/dvb-t/se-Dalfors
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Dalfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Dalstuga b/dvb-t/se-Dalstuga
deleted file mode 100644
index d7f5374b..00000000
--- a/dvb-t/se-Dalstuga
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Dalstuga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Degerfors b/dvb-t/se-Degerfors
deleted file mode 100644
index c0dc0b98..00000000
--- a/dvb-t/se-Degerfors
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Degerfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Delary b/dvb-t/se-Delary
deleted file mode 100644
index 3c9fdf99..00000000
--- a/dvb-t/se-Delary
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Delary
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Djura b/dvb-t/se-Djura
deleted file mode 100644
index c532219d..00000000
--- a/dvb-t/se-Djura
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Djura
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Drevdagen b/dvb-t/se-Drevdagen
deleted file mode 100644
index 8b331c90..00000000
--- a/dvb-t/se-Drevdagen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Drevdagen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Duvnas b/dvb-t/se-Duvnas
deleted file mode 100644
index 4fea0892..00000000
--- a/dvb-t/se-Duvnas
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Duvnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Duvnas_Basna b/dvb-t/se-Duvnas_Basna
deleted file mode 100644
index 22e0bdfd..00000000
--- a/dvb-t/se-Duvnas_Basna
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Duvnäs/Bäsna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Edsbyn b/dvb-t/se-Edsbyn
deleted file mode 100644
index a8a3eaa4..00000000
--- a/dvb-t/se-Edsbyn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Edsbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Emmaboda_Balshult b/dvb-t/se-Emmaboda_Balshult
deleted file mode 100644
index 0e6a2f8f..00000000
--- a/dvb-t/se-Emmaboda_Balshult
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Emmaboda/Bälshult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Enviken b/dvb-t/se-Enviken
deleted file mode 100644
index 0744d26d..00000000
--- a/dvb-t/se-Enviken
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Enviken
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Fagersta b/dvb-t/se-Fagersta
deleted file mode 100644
index 9de6d735..00000000
--- a/dvb-t/se-Fagersta
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Fagersta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Falerum_Centrum b/dvb-t/se-Falerum_Centrum
deleted file mode 100644
index 36d54967..00000000
--- a/dvb-t/se-Falerum_Centrum
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Falerum/Centrum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Falun_Lovberget b/dvb-t/se-Falun_Lovberget
deleted file mode 100644
index 8b6cd13f..00000000
--- a/dvb-t/se-Falun_Lovberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Falun/Lövberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Farila b/dvb-t/se-Farila
deleted file mode 100644
index b1c1840e..00000000
--- a/dvb-t/se-Farila
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Färila
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Faro_Ajkerstrask b/dvb-t/se-Faro_Ajkerstrask
deleted file mode 100644
index 7bdbed79..00000000
--- a/dvb-t/se-Faro_Ajkerstrask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Fårö/Ajkersträsk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Farosund_Bunge b/dvb-t/se-Farosund_Bunge
deleted file mode 100644
index 4148e0b0..00000000
--- a/dvb-t/se-Farosund_Bunge
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Fårösund/Bunge
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Filipstad_Klockarhojden b/dvb-t/se-Filipstad_Klockarhojden
deleted file mode 100644
index a30d2adb..00000000
--- a/dvb-t/se-Filipstad_Klockarhojden
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Filipstad/Klockarhöjden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Finnveden b/dvb-t/se-Finnveden
deleted file mode 100644
index f577cfdf..00000000
--- a/dvb-t/se-Finnveden
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Finnveden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Fredriksberg b/dvb-t/se-Fredriksberg
deleted file mode 100644
index 3838a7b1..00000000
--- a/dvb-t/se-Fredriksberg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Fredriksberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Fritsla b/dvb-t/se-Fritsla
deleted file mode 100644
index fd5dc30b..00000000
--- a/dvb-t/se-Fritsla
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Fritsla
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Furudal b/dvb-t/se-Furudal
deleted file mode 100644
index ca847cf0..00000000
--- a/dvb-t/se-Furudal
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Furudal
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gallivare b/dvb-t/se-Gallivare
deleted file mode 100644
index 27167ea2..00000000
--- a/dvb-t/se-Gallivare
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Gällivare
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Garpenberg_Kuppgarden b/dvb-t/se-Garpenberg_Kuppgarden
deleted file mode 100644
index bcd76852..00000000
--- a/dvb-t/se-Garpenberg_Kuppgarden
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Garpenberg/Kuppgården
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gavle_Skogmur b/dvb-t/se-Gavle_Skogmur
deleted file mode 100644
index 0a229e70..00000000
--- a/dvb-t/se-Gavle_Skogmur
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Gävle/Skogmur
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gnarp b/dvb-t/se-Gnarp
deleted file mode 100644
index b47e78a7..00000000
--- a/dvb-t/se-Gnarp
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Gnarp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gnesta b/dvb-t/se-Gnesta
deleted file mode 100644
index 3f1b75c9..00000000
--- a/dvb-t/se-Gnesta
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Gnesta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gnosjo_Marieholm b/dvb-t/se-Gnosjo_Marieholm
deleted file mode 100644
index ed789ab3..00000000
--- a/dvb-t/se-Gnosjo_Marieholm
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Gnosjö/Marieholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Goteborg_Brudaremossen b/dvb-t/se-Goteborg_Brudaremossen
deleted file mode 100644
index 80d57a70..00000000
--- a/dvb-t/se-Goteborg_Brudaremossen
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Göteborg/Brudaremossen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Goteborg_Slattadamm b/dvb-t/se-Goteborg_Slattadamm
deleted file mode 100644
index 11ccd750..00000000
--- a/dvb-t/se-Goteborg_Slattadamm
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Göteborg/Slättadamm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gullbrandstorp b/dvb-t/se-Gullbrandstorp
deleted file mode 100644
index c407b0dd..00000000
--- a/dvb-t/se-Gullbrandstorp
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Gullbrandstorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gunnarsbo b/dvb-t/se-Gunnarsbo
deleted file mode 100644
index d79b8515..00000000
--- a/dvb-t/se-Gunnarsbo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Gunnarsbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Gusum b/dvb-t/se-Gusum
deleted file mode 100644
index 21411cfc..00000000
--- a/dvb-t/se-Gusum
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Gusum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hagfors_Varmullsasen b/dvb-t/se-Hagfors_Varmullsasen
deleted file mode 100644
index f013fb38..00000000
--- a/dvb-t/se-Hagfors_Varmullsasen
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Hagfors/Värmullsåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hallaryd b/dvb-t/se-Hallaryd
deleted file mode 100644
index 5d21d8a3..00000000
--- a/dvb-t/se-Hallaryd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hallaryd
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hallbo b/dvb-t/se-Hallbo
deleted file mode 100644
index ed0f8dad..00000000
--- a/dvb-t/se-Hallbo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hällbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Halmstad_Hamnen b/dvb-t/se-Halmstad_Hamnen
deleted file mode 100644
index 50c88f3d..00000000
--- a/dvb-t/se-Halmstad_Hamnen
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Halmstad/Hamnen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Halmstad_Oskarstrom b/dvb-t/se-Halmstad_Oskarstrom
deleted file mode 100644
index 9fc55378..00000000
--- a/dvb-t/se-Halmstad_Oskarstrom
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Halmstad/Oskarström
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Harnosand_Harnon b/dvb-t/se-Harnosand_Harnon
deleted file mode 100644
index 242088ef..00000000
--- a/dvb-t/se-Harnosand_Harnon
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Härnösand/Härnön
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hassela b/dvb-t/se-Hassela
deleted file mode 100644
index 7ce07671..00000000
--- a/dvb-t/se-Hassela
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hassela
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Havdhem b/dvb-t/se-Havdhem
deleted file mode 100644
index 43400636..00000000
--- a/dvb-t/se-Havdhem
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Havdhem
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hedemora b/dvb-t/se-Hedemora
deleted file mode 100644
index 94dc5e3f..00000000
--- a/dvb-t/se-Hedemora
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hedemora
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Helsingborg_Olympia b/dvb-t/se-Helsingborg_Olympia
deleted file mode 100644
index 4358f612..00000000
--- a/dvb-t/se-Helsingborg_Olympia
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Helsingborg/Olympia
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Hennan b/dvb-t/se-Hennan
deleted file mode 100644
index cd1605ad..00000000
--- a/dvb-t/se-Hennan
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hennan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hestra_Aspas b/dvb-t/se-Hestra_Aspas
deleted file mode 100644
index ae955cce..00000000
--- a/dvb-t/se-Hestra_Aspas
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hestra/Äspås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hjo_Grevback b/dvb-t/se-Hjo_Grevback
deleted file mode 100644
index 7045a537..00000000
--- a/dvb-t/se-Hjo_Grevback
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hjo/Grevbäck
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hofors b/dvb-t/se-Hofors
deleted file mode 100644
index 9314fc16..00000000
--- a/dvb-t/se-Hofors
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Hofors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hogfors b/dvb-t/se-Hogfors
deleted file mode 100644
index 514f1e5c..00000000
--- a/dvb-t/se-Hogfors
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Högfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hogsby_Virstad b/dvb-t/se-Hogsby_Virstad
deleted file mode 100644
index 0cc2ad67..00000000
--- a/dvb-t/se-Hogsby_Virstad
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Högsby/Virstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Holsbybrunn_Holsbyholm b/dvb-t/se-Holsbybrunn_Holsbyholm
deleted file mode 100644
index e5a1d7b7..00000000
--- a/dvb-t/se-Holsbybrunn_Holsbyholm
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Holsbybrunn/Holsbyholm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Horby_Sallerup b/dvb-t/se-Horby_Sallerup
deleted file mode 100644
index ea54db99..00000000
--- a/dvb-t/se-Horby_Sallerup
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sweden - Hörby/Sallerup
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 570000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Horken b/dvb-t/se-Horken
deleted file mode 100644
index 6f3fcdb4..00000000
--- a/dvb-t/se-Horken
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Hörken
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Hudiksvall_Forsa b/dvb-t/se-Hudiksvall_Forsa
deleted file mode 100644
index c8bad491..00000000
--- a/dvb-t/se-Hudiksvall_Forsa
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Hudiksvall/Forsa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Hudiksvall_Galgberget b/dvb-t/se-Hudiksvall_Galgberget
deleted file mode 100644
index b95873e7..00000000
--- a/dvb-t/se-Hudiksvall_Galgberget
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Hudiksvall/Galgberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Huskvarna b/dvb-t/se-Huskvarna
deleted file mode 100644
index 2c6a5ca0..00000000
--- a/dvb-t/se-Huskvarna
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Huskvarna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Idre b/dvb-t/se-Idre
deleted file mode 100644
index 912aa70f..00000000
--- a/dvb-t/se-Idre
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Idre
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ingatorp b/dvb-t/se-Ingatorp
deleted file mode 100644
index 11d37b54..00000000
--- a/dvb-t/se-Ingatorp
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ingatorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ingvallsbenning b/dvb-t/se-Ingvallsbenning
deleted file mode 100644
index 87267599..00000000
--- a/dvb-t/se-Ingvallsbenning
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ingvallsbenning
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Irevik b/dvb-t/se-Irevik
deleted file mode 100644
index 15307716..00000000
--- a/dvb-t/se-Irevik
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Irevik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Jamjo b/dvb-t/se-Jamjo
deleted file mode 100644
index 0c14927e..00000000
--- a/dvb-t/se-Jamjo
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Jämjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Jarnforsen b/dvb-t/se-Jarnforsen
deleted file mode 100644
index d129f356..00000000
--- a/dvb-t/se-Jarnforsen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Järnforsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Jarvso b/dvb-t/se-Jarvso
deleted file mode 100644
index c779daf1..00000000
--- a/dvb-t/se-Jarvso
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Järvsö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Jokkmokk_Tjalmejaure b/dvb-t/se-Jokkmokk_Tjalmejaure
deleted file mode 100644
index 74d4ca36..00000000
--- a/dvb-t/se-Jokkmokk_Tjalmejaure
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Jokkmokk/Tjalmejaure
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Jonkoping_Bondberget b/dvb-t/se-Jonkoping_Bondberget
deleted file mode 100644
index 5c0d21e8..00000000
--- a/dvb-t/se-Jonkoping_Bondberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Jönköping/Bondberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kalix b/dvb-t/se-Kalix
deleted file mode 100644
index 21a29a89..00000000
--- a/dvb-t/se-Kalix
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Kalix
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Karbole b/dvb-t/se-Karbole
deleted file mode 100644
index 9f28422a..00000000
--- a/dvb-t/se-Karbole
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Kårböle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Karlsborg_Vaberget b/dvb-t/se-Karlsborg_Vaberget
deleted file mode 100644
index b84b8e84..00000000
--- a/dvb-t/se-Karlsborg_Vaberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Karlsborg/Vaberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Karlshamn b/dvb-t/se-Karlshamn
deleted file mode 100644
index ed3a7cd2..00000000
--- a/dvb-t/se-Karlshamn
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Karlshamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Karlskrona_Vamo b/dvb-t/se-Karlskrona_Vamo
deleted file mode 100644
index 68e38aed..00000000
--- a/dvb-t/se-Karlskrona_Vamo
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Karlskrona/Vämö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Karlstad_Sormon b/dvb-t/se-Karlstad_Sormon
deleted file mode 100644
index 658bc70d..00000000
--- a/dvb-t/se-Karlstad_Sormon
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sweden - Karlstad Sörmon Valid from 2007 09 26. Ver. 2 Correct FEC
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# Channels
-# Mux3=30
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Mux4=42
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-# Mux1=43
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kaxholmen_Vistakulle b/dvb-t/se-Kaxholmen_Vistakulle
deleted file mode 100644
index ede8ad95..00000000
--- a/dvb-t/se-Kaxholmen_Vistakulle
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Kaxholmen/Vistakulle
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kinnastrom b/dvb-t/se-Kinnastrom
deleted file mode 100644
index 61256ebf..00000000
--- a/dvb-t/se-Kinnastrom
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Kinnaström
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kiruna_Kirunavaara b/dvb-t/se-Kiruna_Kirunavaara
deleted file mode 100644
index dac4c242..00000000
--- a/dvb-t/se-Kiruna_Kirunavaara
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Kiruna/Kirunavaara
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kisa b/dvb-t/se-Kisa
deleted file mode 100644
index 21d4bc32..00000000
--- a/dvb-t/se-Kisa
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Kisa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Knared b/dvb-t/se-Knared
deleted file mode 100644
index 2feda10a..00000000
--- a/dvb-t/se-Knared
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Knäred
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kopmanholmen b/dvb-t/se-Kopmanholmen
deleted file mode 100644
index f9f9541f..00000000
--- a/dvb-t/se-Kopmanholmen
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Köpmanholmen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kopparberg b/dvb-t/se-Kopparberg
deleted file mode 100644
index af84cfeb..00000000
--- a/dvb-t/se-Kopparberg
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Kopparberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kramfors_Lugnvik b/dvb-t/se-Kramfors_Lugnvik
deleted file mode 100644
index f17f8c14..00000000
--- a/dvb-t/se-Kramfors_Lugnvik
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Kramfors/Lugnvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kristinehamn_Utsiktsberget b/dvb-t/se-Kristinehamn_Utsiktsberget
deleted file mode 100644
index 71c465dc..00000000
--- a/dvb-t/se-Kristinehamn_Utsiktsberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Kristinehamn/Utsiktsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Kungsater b/dvb-t/se-Kungsater
deleted file mode 100644
index 0876dba2..00000000
--- a/dvb-t/se-Kungsater
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Kungsäter
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Kungsberget_GI b/dvb-t/se-Kungsberget_GI
deleted file mode 100644
index 0c4eeb3b..00000000
--- a/dvb-t/se-Kungsberget_GI
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Kungsberget/GI
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Langshyttan b/dvb-t/se-Langshyttan
deleted file mode 100644
index bbba370a..00000000
--- a/dvb-t/se-Langshyttan
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - LÃ¥ngshyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Langshyttan_Engelsfors b/dvb-t/se-Langshyttan_Engelsfors
deleted file mode 100644
index 373446ad..00000000
--- a/dvb-t/se-Langshyttan_Engelsfors
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - LÃ¥ngshyttan/Engelsfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Leksand_Karingberget b/dvb-t/se-Leksand_Karingberget
deleted file mode 100644
index 2d155618..00000000
--- a/dvb-t/se-Leksand_Karingberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Leksand/Käringberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lerdala b/dvb-t/se-Lerdala
deleted file mode 100644
index 2428c690..00000000
--- a/dvb-t/se-Lerdala
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Lerdala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lilltjara_Digerberget b/dvb-t/se-Lilltjara_Digerberget
deleted file mode 100644
index f2cee9f5..00000000
--- a/dvb-t/se-Lilltjara_Digerberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Lilltjära/Digerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Limedsforsen b/dvb-t/se-Limedsforsen
deleted file mode 100644
index 12b36efb..00000000
--- a/dvb-t/se-Limedsforsen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Limedsforsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lindshammar_Ramkvilla b/dvb-t/se-Lindshammar_Ramkvilla
deleted file mode 100644
index 9a03b1e5..00000000
--- a/dvb-t/se-Lindshammar_Ramkvilla
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Lindshammar/Ramkvilla
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Linkoping_Vattentornet b/dvb-t/se-Linkoping_Vattentornet
deleted file mode 100644
index 31adae86..00000000
--- a/dvb-t/se-Linkoping_Vattentornet
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Linköping/Vattentornet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ljugarn b/dvb-t/se-Ljugarn
deleted file mode 100644
index 6474a156..00000000
--- a/dvb-t/se-Ljugarn
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Ljugarn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Loffstrand b/dvb-t/se-Loffstrand
deleted file mode 100644
index f95de052..00000000
--- a/dvb-t/se-Loffstrand
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Loffstrand
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 650000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 762000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
deleted file mode 100644
index 8664ea9d..00000000
--- a/dvb-t/se-Lonneberga
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Lönneberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lorstrand b/dvb-t/se-Lorstrand
deleted file mode 100644
index 30867a37..00000000
--- a/dvb-t/se-Lorstrand
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Lörstrand
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ludvika_Bjorkasen b/dvb-t/se-Ludvika_Bjorkasen
deleted file mode 100644
index 07bccd45..00000000
--- a/dvb-t/se-Ludvika_Bjorkasen
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Ludvika/Björkåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lumsheden_Trekanten b/dvb-t/se-Lumsheden_Trekanten
deleted file mode 100644
index c8a1c9d1..00000000
--- a/dvb-t/se-Lumsheden_Trekanten
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Lumsheden/Trekanten
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Lycksele_Knaften b/dvb-t/se-Lycksele_Knaften
deleted file mode 100644
index 05d64695..00000000
--- a/dvb-t/se-Lycksele_Knaften
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Lycksele/Knaften
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Mahult b/dvb-t/se-Mahult
deleted file mode 100644
index 3c45ffab..00000000
--- a/dvb-t/se-Mahult
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Mahult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Malmo_Jagersro b/dvb-t/se-Malmo_Jagersro
deleted file mode 100644
index 2d0d845f..00000000
--- a/dvb-t/se-Malmo_Jagersro
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Malmö/Jägersro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Malung b/dvb-t/se-Malung
deleted file mode 100644
index fe2b08db..00000000
--- a/dvb-t/se-Malung
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Malung
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Mariannelund b/dvb-t/se-Mariannelund
deleted file mode 100644
index 2ec7cd67..00000000
--- a/dvb-t/se-Mariannelund
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Mariannelund
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Markaryd_Hualtet b/dvb-t/se-Markaryd_Hualtet
deleted file mode 100644
index 941f30cb..00000000
--- a/dvb-t/se-Markaryd_Hualtet
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Markaryd/Hualtet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Matfors b/dvb-t/se-Matfors
deleted file mode 100644
index d9569298..00000000
--- a/dvb-t/se-Matfors
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Matfors
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Molndal_Vasterberget b/dvb-t/se-Molndal_Vasterberget
deleted file mode 100644
index 8f38e4c2..00000000
--- a/dvb-t/se-Molndal_Vasterberget
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Mölndal/Västerberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Mora_Eldris b/dvb-t/se-Mora_Eldris
deleted file mode 100644
index 9b7253c5..00000000
--- a/dvb-t/se-Mora_Eldris
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Mora/Eldris
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Motala_Ervasteby b/dvb-t/se-Motala_Ervasteby
deleted file mode 100644
index 4d673f4b..00000000
--- a/dvb-t/se-Motala_Ervasteby
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Motala/Ervasteby
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Mullsjo_Torestorp b/dvb-t/se-Mullsjo_Torestorp
deleted file mode 100644
index 264c4432..00000000
--- a/dvb-t/se-Mullsjo_Torestorp
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Mullsjö/Torestorp
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 850000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Nassjo b/dvb-t/se-Nassjo
deleted file mode 100644
index 9fe77699..00000000
--- a/dvb-t/se-Nassjo
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Nässjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Navekvarn b/dvb-t/se-Navekvarn
deleted file mode 100644
index 10168004..00000000
--- a/dvb-t/se-Navekvarn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Nävekvarn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Norrahammar b/dvb-t/se-Norrahammar
deleted file mode 100644
index f6ae37da..00000000
--- a/dvb-t/se-Norrahammar
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Norrahammar
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Norrkoping_Krokek b/dvb-t/se-Norrkoping_Krokek
deleted file mode 100644
index 24fed0cc..00000000
--- a/dvb-t/se-Norrkoping_Krokek
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Norrköping/Krokek
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Norrtalje_Sodra_Bergen b/dvb-t/se-Norrtalje_Sodra_Bergen
deleted file mode 100644
index 3fb43c6b..00000000
--- a/dvb-t/se-Norrtalje_Sodra_Bergen
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Norrtälje/Södra Bergen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Nykoping b/dvb-t/se-Nykoping
deleted file mode 100644
index 848261c4..00000000
--- a/dvb-t/se-Nykoping
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Nyköping
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Orebro_Lockhyttan b/dvb-t/se-Orebro_Lockhyttan
deleted file mode 100644
index 22a5d515..00000000
--- a/dvb-t/se-Orebro_Lockhyttan
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Örebro/Lockhyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ornskoldsvik_As b/dvb-t/se-Ornskoldsvik_As
deleted file mode 100644
index 8fa6edb8..00000000
--- a/dvb-t/se-Ornskoldsvik_As
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Örnsköldsvik/Ås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Oskarshamn b/dvb-t/se-Oskarshamn
deleted file mode 100644
index 98e84765..00000000
--- a/dvb-t/se-Oskarshamn
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Oskarshamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ostersund_Brattasen b/dvb-t/se-Ostersund_Brattasen
deleted file mode 100644
index c3828f63..00000000
--- a/dvb-t/se-Ostersund_Brattasen
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Östersund/Brattåsen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Osthammar_Valo b/dvb-t/se-Osthammar_Valo
deleted file mode 100644
index d6169279..00000000
--- a/dvb-t/se-Osthammar_Valo
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Östhammar/Valö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Overkalix b/dvb-t/se-Overkalix
deleted file mode 100644
index 91ec2f55..00000000
--- a/dvb-t/se-Overkalix
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Överkalix
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Oxberg b/dvb-t/se-Oxberg
deleted file mode 100644
index 6a61626a..00000000
--- a/dvb-t/se-Oxberg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Oxberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Pajala b/dvb-t/se-Pajala
deleted file mode 100644
index 98b564d8..00000000
--- a/dvb-t/se-Pajala
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Pajala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_2
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_3
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_1
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE #Teracom_Mux_4
diff --git a/dvb-t/se-Paulistom b/dvb-t/se-Paulistom
deleted file mode 100644
index e4abab53..00000000
--- a/dvb-t/se-Paulistom
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Paulistöm
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Rattvik b/dvb-t/se-Rattvik
deleted file mode 100644
index f8ffe5f2..00000000
--- a/dvb-t/se-Rattvik
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Rättvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Rengsjo b/dvb-t/se-Rengsjo
deleted file mode 100644
index 7bb743f8..00000000
--- a/dvb-t/se-Rengsjo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Rengsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Rorbacksnas b/dvb-t/se-Rorbacksnas
deleted file mode 100644
index fb45ce79..00000000
--- a/dvb-t/se-Rorbacksnas
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Rörbäcksnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sagmyra b/dvb-t/se-Sagmyra
deleted file mode 100644
index f68169b7..00000000
--- a/dvb-t/se-Sagmyra
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - SÃ¥gmyra
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Salen b/dvb-t/se-Salen
deleted file mode 100644
index 37850594..00000000
--- a/dvb-t/se-Salen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Sälen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Salfjallet b/dvb-t/se-Salfjallet
deleted file mode 100644
index d271e62b..00000000
--- a/dvb-t/se-Salfjallet
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Sälfjället
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sarna_Mickeltemplet b/dvb-t/se-Sarna_Mickeltemplet
deleted file mode 100644
index 09f88095..00000000
--- a/dvb-t/se-Sarna_Mickeltemplet
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Särna/Mickeltemplet
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Satila b/dvb-t/se-Satila
deleted file mode 100644
index 6f8690f6..00000000
--- a/dvb-t/se-Satila
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Sätila
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Saxdalen b/dvb-t/se-Saxdalen
deleted file mode 100644
index 0c2db677..00000000
--- a/dvb-t/se-Saxdalen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Saxdalen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Siljansnas_Uvberget b/dvb-t/se-Siljansnas_Uvberget
deleted file mode 100644
index a087eafa..00000000
--- a/dvb-t/se-Siljansnas_Uvberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Siljansnäs/Uvberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Skarstad b/dvb-t/se-Skarstad
deleted file mode 100644
index edc1aac0..00000000
--- a/dvb-t/se-Skarstad
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Skärstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Skattungbyn b/dvb-t/se-Skattungbyn
deleted file mode 100644
index d5b0a234..00000000
--- a/dvb-t/se-Skattungbyn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Skattungbyn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Skelleftea b/dvb-t/se-Skelleftea
deleted file mode 100644
index d831d9ea..00000000
--- a/dvb-t/se-Skelleftea
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Skellefteå
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Skene_Nycklarberget b/dvb-t/se-Skene_Nycklarberget
deleted file mode 100644
index 9070ae8b..00000000
--- a/dvb-t/se-Skene_Nycklarberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Skene/Nycklarberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Skovde b/dvb-t/se-Skovde
deleted file mode 100644
index b79f179c..00000000
--- a/dvb-t/se-Skovde
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Skövde
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Smedjebacken_Uvberget b/dvb-t/se-Smedjebacken_Uvberget
deleted file mode 100644
index abe5f664..00000000
--- a/dvb-t/se-Smedjebacken_Uvberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Smedjebacken/Uvberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Soderhamn b/dvb-t/se-Soderhamn
deleted file mode 100644
index a7d6fef0..00000000
--- a/dvb-t/se-Soderhamn
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Söderhamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 810000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Soderkoping b/dvb-t/se-Soderkoping
deleted file mode 100644
index 91ceddf4..00000000
--- a/dvb-t/se-Soderkoping
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Söderköping
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sodertalje_Ragnhildsborg b/dvb-t/se-Sodertalje_Ragnhildsborg
deleted file mode 100644
index a6439552..00000000
--- a/dvb-t/se-Sodertalje_Ragnhildsborg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Sweden - Södertälje/Ragnhildsborg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Solleftea_Hallsta b/dvb-t/se-Solleftea_Hallsta
deleted file mode 100644
index ed48f903..00000000
--- a/dvb-t/se-Solleftea_Hallsta
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Sollefteå/Hallsta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Solleftea_Multra b/dvb-t/se-Solleftea_Multra
deleted file mode 100644
index 11ff0a3a..00000000
--- a/dvb-t/se-Solleftea_Multra
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Sollefteå/Multrå
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sorsjon b/dvb-t/se-Sorsjon
deleted file mode 100644
index bead4db8..00000000
--- a/dvb-t/se-Sorsjon
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Sörsjön
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Stockholm_Marieberg b/dvb-t/se-Stockholm_Marieberg
deleted file mode 100644
index 1b35b14a..00000000
--- a/dvb-t/se-Stockholm_Marieberg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Stockholm/Marieberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Stockholm_Nacka b/dvb-t/se-Stockholm_Nacka
deleted file mode 100644
index e13a95ea..00000000
--- a/dvb-t/se-Stockholm_Nacka
+++ /dev/null
@@ -1,8 +0,0 @@
-# Sweden - Stockholm/Nacka
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_1
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_2
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_3
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_4
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_5
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE # Teracom_Mux_6
diff --git a/dvb-t/se-Stora_Skedvi b/dvb-t/se-Stora_Skedvi
deleted file mode 100644
index 2bcd9657..00000000
--- a/dvb-t/se-Stora_Skedvi
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Stora Skedvi
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Storfjaten b/dvb-t/se-Storfjaten
deleted file mode 100644
index 9c9a73b3..00000000
--- a/dvb-t/se-Storfjaten
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Storfjäten
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Storuman b/dvb-t/se-Storuman
deleted file mode 100644
index 28092f0b..00000000
--- a/dvb-t/se-Storuman
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Storuman
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Stromstad b/dvb-t/se-Stromstad
deleted file mode 100644
index 27a2f753..00000000
--- a/dvb-t/se-Stromstad
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Strömstad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Styrsjobo b/dvb-t/se-Styrsjobo
deleted file mode 100644
index 2970f41c..00000000
--- a/dvb-t/se-Styrsjobo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Styrsjöbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sundborn b/dvb-t/se-Sundborn
deleted file mode 100644
index 182158b4..00000000
--- a/dvb-t/se-Sundborn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Sundborn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sundsbruk b/dvb-t/se-Sundsbruk
deleted file mode 100644
index 66807513..00000000
--- a/dvb-t/se-Sundsbruk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Sundsbruk
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sundsvall_S_Stadsberget b/dvb-t/se-Sundsvall_S_Stadsberget
deleted file mode 100644
index 14a4a730..00000000
--- a/dvb-t/se-Sundsvall_S_Stadsberget
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Sundsvall/S Stadsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sunne_Blabarskullen b/dvb-t/se-Sunne_Blabarskullen
deleted file mode 100644
index 02f84361..00000000
--- a/dvb-t/se-Sunne_Blabarskullen
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Sunne/Blåbärskullen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Svartnas b/dvb-t/se-Svartnas
deleted file mode 100644
index afcb44ce..00000000
--- a/dvb-t/se-Svartnas
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Svartnäs
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Sveg_Brickan b/dvb-t/se-Sveg_Brickan
deleted file mode 100644
index ad2683b2..00000000
--- a/dvb-t/se-Sveg_Brickan
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Sveg/Brickan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Taberg b/dvb-t/se-Taberg
deleted file mode 100644
index 45a752a6..00000000
--- a/dvb-t/se-Taberg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Taberg
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tandadalen b/dvb-t/se-Tandadalen
deleted file mode 100644
index 8468db5d..00000000
--- a/dvb-t/se-Tandadalen
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Tandådalen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tasjo b/dvb-t/se-Tasjo
deleted file mode 100644
index 5783f737..00000000
--- a/dvb-t/se-Tasjo
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Tåsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tollsjo b/dvb-t/se-Tollsjo
deleted file mode 100644
index 97389e51..00000000
--- a/dvb-t/se-Tollsjo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Töllsjö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Torsby_Bada b/dvb-t/se-Torsby_Bada
deleted file mode 100644
index 72ef507c..00000000
--- a/dvb-t/se-Torsby_Bada
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Torsby/Bada
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tranas_Bredkarr b/dvb-t/se-Tranas_Bredkarr
deleted file mode 100644
index bf32792e..00000000
--- a/dvb-t/se-Tranas_Bredkarr
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Tranås/Bredkärr
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tranemo b/dvb-t/se-Tranemo
deleted file mode 100644
index d3bebfdf..00000000
--- a/dvb-t/se-Tranemo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Tranemo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Transtrand_Bolheden b/dvb-t/se-Transtrand_Bolheden
deleted file mode 100644
index 9682a699..00000000
--- a/dvb-t/se-Transtrand_Bolheden
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Transtrand/Bolheden
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Traryd_Betas b/dvb-t/se-Traryd_Betas
deleted file mode 100644
index 72bb2641..00000000
--- a/dvb-t/se-Traryd_Betas
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Traryd/Betås
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Trollhattan b/dvb-t/se-Trollhattan
deleted file mode 100644
index 790963ed..00000000
--- a/dvb-t/se-Trollhattan
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Trollhättan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Trosa b/dvb-t/se-Trosa
deleted file mode 100644
index 6b11b6ad..00000000
--- a/dvb-t/se-Trosa
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Trosa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Tystberga b/dvb-t/se-Tystberga
deleted file mode 100644
index 31796488..00000000
--- a/dvb-t/se-Tystberga
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Tystberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Uddevalla_Herrestad b/dvb-t/se-Uddevalla_Herrestad
deleted file mode 100644
index aae5e17f..00000000
--- a/dvb-t/se-Uddevalla_Herrestad
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Uddevalla/Herrestad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Ullared b/dvb-t/se-Ullared
deleted file mode 100644
index 7f5956c7..00000000
--- a/dvb-t/se-Ullared
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ullared
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ulricehamn b/dvb-t/se-Ulricehamn
deleted file mode 100644
index 06413e92..00000000
--- a/dvb-t/se-Ulricehamn
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Ulricehamn
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 842000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ulvshyttan_Porjus b/dvb-t/se-Ulvshyttan_Porjus
deleted file mode 100644
index f69dbfd4..00000000
--- a/dvb-t/se-Ulvshyttan_Porjus
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Ulvshyttan/Porjus
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Uppsala_Rickomberga b/dvb-t/se-Uppsala_Rickomberga
deleted file mode 100644
index a771e5db..00000000
--- a/dvb-t/se-Uppsala_Rickomberga
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Uppsala/Rickomberga
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Uppsala_Vedyxa b/dvb-t/se-Uppsala_Vedyxa
deleted file mode 100644
index 6bd4db8a..00000000
--- a/dvb-t/se-Uppsala_Vedyxa
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Uppsala/Vedyxa
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vaddo_Elmsta b/dvb-t/se-Vaddo_Elmsta
deleted file mode 100644
index aabc9d62..00000000
--- a/dvb-t/se-Vaddo_Elmsta
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Väddö/Elmsta
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Valdemarsvik b/dvb-t/se-Valdemarsvik
deleted file mode 100644
index 20b8a8e2..00000000
--- a/dvb-t/se-Valdemarsvik
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sweden - Valdemarsvik
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vannas_Granlundsberget b/dvb-t/se-Vannas_Granlundsberget
deleted file mode 100644
index 2ef81d1b..00000000
--- a/dvb-t/se-Vannas_Granlundsberget
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Vännäs/Granlundsberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vansbro_Hummelberget b/dvb-t/se-Vansbro_Hummelberget
deleted file mode 100644
index 1280490d..00000000
--- a/dvb-t/se-Vansbro_Hummelberget
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Vansbro/Hummelberget
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Varberg_Grimeton b/dvb-t/se-Varberg_Grimeton
deleted file mode 100644
index abfdd542..00000000
--- a/dvb-t/se-Varberg_Grimeton
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Varberg/Grimeton
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 666000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Vasteras_Lillharad b/dvb-t/se-Vasteras_Lillharad
deleted file mode 100644
index 976bff79..00000000
--- a/dvb-t/se-Vasteras_Lillharad
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Västerås/Lillhärad
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vastervik_Farhult b/dvb-t/se-Vastervik_Farhult
deleted file mode 100644
index b57a9d30..00000000
--- a/dvb-t/se-Vastervik_Farhult
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Västervik/Fårhult
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vaxbo b/dvb-t/se-Vaxbo
deleted file mode 100644
index 42144129..00000000
--- a/dvb-t/se-Vaxbo
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Växbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vessigebro b/dvb-t/se-Vessigebro
deleted file mode 100644
index 56a7e161..00000000
--- a/dvb-t/se-Vessigebro
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Vessigebro
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vetlanda_Nye b/dvb-t/se-Vetlanda_Nye
deleted file mode 100644
index 540e2257..00000000
--- a/dvb-t/se-Vetlanda_Nye
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Vetlanda/Nye
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vikmanshyttan b/dvb-t/se-Vikmanshyttan
deleted file mode 100644
index 1def8f38..00000000
--- a/dvb-t/se-Vikmanshyttan
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Vikmanshyttan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Virserum b/dvb-t/se-Virserum
deleted file mode 100644
index 601a573f..00000000
--- a/dvb-t/se-Virserum
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Virserum
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Visby_Follingbo b/dvb-t/se-Visby_Follingbo
deleted file mode 100644
index f5ec59dd..00000000
--- a/dvb-t/se-Visby_Follingbo
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Visby/Follingbo
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Visby_Hamnen b/dvb-t/se-Visby_Hamnen
deleted file mode 100644
index 374bcb43..00000000
--- a/dvb-t/se-Visby_Hamnen
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Visby/Hamnen
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Visingso b/dvb-t/se-Visingso
deleted file mode 100644
index 6be33bd6..00000000
--- a/dvb-t/se-Visingso
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Visingsö
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Vislanda_Nydala b/dvb-t/se-Vislanda_Nydala
deleted file mode 100644
index 56113230..00000000
--- a/dvb-t/se-Vislanda_Nydala
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sweden - Vislanda/Nydala
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Voxna b/dvb-t/se-Voxna
deleted file mode 100644
index 8a37481d..00000000
--- a/dvb-t/se-Voxna
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Voxna
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/se-Ystad_Metallgatan b/dvb-t/se-Ystad_Metallgatan
deleted file mode 100644
index c93c9952..00000000
--- a/dvb-t/se-Ystad_Metallgatan
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sweden - Ystad/Metallgatan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 634000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
-T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/se-Yttermalung b/dvb-t/se-Yttermalung
deleted file mode 100644
index 5262080c..00000000
--- a/dvb-t/se-Yttermalung
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sweden - Yttermalung
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/si-Ljubljana b/dvb-t/si-Ljubljana
deleted file mode 100644
index 3825669b..00000000
--- a/dvb-t/si-Ljubljana
+++ /dev/null
@@ -1,5 +0,0 @@
-# Slovenia / Ljubljana
-# MULTIPLEX A
-#------------------------------------------
-T 602000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
diff --git a/dvb-t/sk-BanskaBystrica b/dvb-t/sk-BanskaBystrica
deleted file mode 100644
index 1f8b0de6..00000000
--- a/dvb-t/sk-BanskaBystrica
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Banska Bystrica (Banska Bystrica, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 51
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-BanskaStiavnica b/dvb-t/sk-BanskaStiavnica
deleted file mode 100644
index c70c048b..00000000
--- a/dvb-t/sk-BanskaStiavnica
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Banska Stiavnica (Banska Stiavnica, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 21
-T 306000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Bardejov b/dvb-t/sk-Bardejov
deleted file mode 100644
index e8b6bf0a..00000000
--- a/dvb-t/sk-Bardejov
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Bardejov (Bardejov, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 40
-T 626000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Bratislava b/dvb-t/sk-Bratislava
deleted file mode 100644
index 8d4fb83f..00000000
--- a/dvb-t/sk-Bratislava
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Bratislava (Bratislava, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 56
-T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Cadca b/dvb-t/sk-Cadca
deleted file mode 100644
index 14481bb3..00000000
--- a/dvb-t/sk-Cadca
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Cadca (Cadca, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Detva b/dvb-t/sk-Detva
deleted file mode 100644
index 83824e78..00000000
--- a/dvb-t/sk-Detva
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Detva (Detva, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Hnusta b/dvb-t/sk-Hnusta
deleted file mode 100644
index b716e926..00000000
--- a/dvb-t/sk-Hnusta
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Hnusta (Hnusta, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Kosice b/dvb-t/sk-Kosice
deleted file mode 100644
index b9a39c9c..00000000
--- a/dvb-t/sk-Kosice
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Kosice (Kosice, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-KralovskyChlmec b/dvb-t/sk-KralovskyChlmec
deleted file mode 100644
index 3a9b136c..00000000
--- a/dvb-t/sk-KralovskyChlmec
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Kralovsky Chlmec (Kralovsky Chlmec, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Krompachy b/dvb-t/sk-Krompachy
deleted file mode 100644
index b36fb7a4..00000000
--- a/dvb-t/sk-Krompachy
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Krompachy (Krompachy, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Lucenec b/dvb-t/sk-Lucenec
deleted file mode 100644
index e4d8f93b..00000000
--- a/dvb-t/sk-Lucenec
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Lucenec (Lucenec, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 60
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 33
-T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Medzev b/dvb-t/sk-Medzev
deleted file mode 100644
index 6d29a4bd..00000000
--- a/dvb-t/sk-Medzev
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Medzev (Medzev, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Namestovo b/dvb-t/sk-Namestovo
deleted file mode 100644
index 94d10a38..00000000
--- a/dvb-t/sk-Namestovo
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Namestovo (Namestovo, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Nitra b/dvb-t/sk-Nitra
deleted file mode 100644
index 9a2290ca..00000000
--- a/dvb-t/sk-Nitra
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Nitra (Nitra, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Poprad b/dvb-t/sk-Poprad
deleted file mode 100644
index 80965380..00000000
--- a/dvb-t/sk-Poprad
+++ /dev/null
@@ -1,10 +0,0 @@
-# DVB-T Poprad (Poprad, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 55
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 24/54
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-PovazskaBystrica b/dvb-t/sk-PovazskaBystrica
deleted file mode 100644
index 330120cf..00000000
--- a/dvb-t/sk-PovazskaBystrica
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Povazska Bystrica (Povazska Bystrica, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Presov b/dvb-t/sk-Presov
deleted file mode 100644
index 6516cea4..00000000
--- a/dvb-t/sk-Presov
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Prešov (Prešov, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# MUX2 - Commercial - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# MUX3 - Public - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Prievidza b/dvb-t/sk-Prievidza
deleted file mode 100644
index 2b6e25f2..00000000
--- a/dvb-t/sk-Prievidza
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Prievidza (Prievidza, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Revuca b/dvb-t/sk-Revuca
deleted file mode 100644
index 75f671b8..00000000
--- a/dvb-t/sk-Revuca
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Revuca (Revuca, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Roznava b/dvb-t/sk-Roznava
deleted file mode 100644
index 01ccc418..00000000
--- a/dvb-t/sk-Roznava
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Roznava (Roznava, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 27
-T 522000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 54
-T 738000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Ruzomberok b/dvb-t/sk-Ruzomberok
deleted file mode 100644
index bd7847eb..00000000
--- a/dvb-t/sk-Ruzomberok
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Ruzomberok (Ruzomberok, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 26
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Snina b/dvb-t/sk-Snina
deleted file mode 100644
index 52c1e2c2..00000000
--- a/dvb-t/sk-Snina
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Snina (Snina, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 59
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 25
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-StaraLubovna b/dvb-t/sk-StaraLubovna
deleted file mode 100644
index 4738b85b..00000000
--- a/dvb-t/sk-StaraLubovna
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Stara Lubovna (Stara Lubovna, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 55
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 24
-T 498000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Sturovo b/dvb-t/sk-Sturovo
deleted file mode 100644
index 41b64868..00000000
--- a/dvb-t/sk-Sturovo
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Sturovo (Sturovo, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 21
-T 474000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 48
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Trencin b/dvb-t/sk-Trencin
deleted file mode 100644
index 743a99a7..00000000
--- a/dvb-t/sk-Trencin
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Trencin (Trencin, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 57
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/sk-Zilina b/dvb-t/sk-Zilina
deleted file mode 100644
index 8e9ba16c..00000000
--- a/dvb-t/sk-Zilina
+++ /dev/null
@@ -1,9 +0,0 @@
-# DVB-T Zilina (Zilina, Slovak Republic)
-# Created from http://www.dvbt.towercom.sk/odbornici.php
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-# 2.st multiplex (commercial) - on channel 52
-T 722000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
-
-# 3.st multiplex (public) - on channel 32
-T 562000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE
diff --git a/dvb-t/tw-Kaohsiung b/dvb-t/tw-Kaohsiung
deleted file mode 100644
index f1eabc9c..00000000
--- a/dvb-t/tw-Kaohsiung
+++ /dev/null
@@ -1,6 +0,0 @@
-# Taiwan - Kaohsiung, southern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
diff --git a/dvb-t/tw-Taipei b/dvb-t/tw-Taipei
deleted file mode 100644
index 3bba686d..00000000
--- a/dvb-t/tw-Taipei
+++ /dev/null
@@ -1,7 +0,0 @@
-# Taiwan - Taipei, northern Taiwan
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 533000000 6MHz 1/2 NONE QAM16 8k 1/8 NONE
-T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
-T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
-T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
diff --git a/dvb-t/uk-Aberdare b/dvb-t/uk-Aberdare
deleted file mode 100644
index 1676d8da..00000000
--- a/dvb-t/uk-Aberdare
+++ /dev/null
@@ -1,15 +0,0 @@
-# UK, Aberdare
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-
-T 474167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-
-
-#C21+ C22+ C24- C25+ C27- C28+
-
diff --git a/dvb-t/uk-Angus b/dvb-t/uk-Angus
deleted file mode 100644
index 250295df..00000000
--- a/dvb-t/uk-Angus
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Angus
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BeaconHill b/dvb-t/uk-BeaconHill
deleted file mode 100644
index 8d1577d0..00000000
--- a/dvb-t/uk-BeaconHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Beacon Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 738167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Belmont b/dvb-t/uk-Belmont
deleted file mode 100644
index fee76dbf..00000000
--- a/dvb-t/uk-Belmont
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Belmont
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bilsdale b/dvb-t/uk-Bilsdale
deleted file mode 100644
index d05c95f6..00000000
--- a/dvb-t/uk-Bilsdale
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bilsdale
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BlackHill b/dvb-t/uk-BlackHill
index ac8c2c1d..17eae724 100644
--- a/dvb-t/uk-BlackHill
+++ b/dvb-t/uk-BlackHill
@@ -1,10 +1,3 @@
-# UK, Black Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# uk BlackHill
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-Blaenplwyf b/dvb-t/uk-Blaenplwyf
deleted file mode 100644
index 35dbade2..00000000
--- a/dvb-t/uk-Blaenplwyf
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Blaenplwyf
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BluebellHill b/dvb-t/uk-BluebellHill
deleted file mode 100644
index 096d08b2..00000000
--- a/dvb-t/uk-BluebellHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bluebell Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bressay b/dvb-t/uk-Bressay
deleted file mode 100644
index c77bfb07..00000000
--- a/dvb-t/uk-Bressay
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bressay
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BrierleyHill b/dvb-t/uk-BrierleyHill
deleted file mode 100644
index 20b32479..00000000
--- a/dvb-t/uk-BrierleyHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Brierley Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BristolIlchesterCres b/dvb-t/uk-BristolIlchesterCres
deleted file mode 100644
index c84c2240..00000000
--- a/dvb-t/uk-BristolIlchesterCres
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bristol Ilchester Cres.
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BristolKingsWeston b/dvb-t/uk-BristolKingsWeston
deleted file mode 100644
index e3425ee7..00000000
--- a/dvb-t/uk-BristolKingsWeston
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bristol King's Weston
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 482000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Bromsgrove b/dvb-t/uk-Bromsgrove
deleted file mode 100644
index efca5873..00000000
--- a/dvb-t/uk-Bromsgrove
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Bromsgrove
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 537833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-BrougherMountain b/dvb-t/uk-BrougherMountain
deleted file mode 100644
index d8ad2386..00000000
--- a/dvb-t/uk-BrougherMountain
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Brougher Mountain
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 490167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Caldbeck b/dvb-t/uk-Caldbeck
deleted file mode 100644
index 75f29522..00000000
--- a/dvb-t/uk-Caldbeck
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Caldbeck
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 506000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-CaradonHill b/dvb-t/uk-CaradonHill
deleted file mode 100644
index 90f6eef4..00000000
--- a/dvb-t/uk-CaradonHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Caradon Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Carmel b/dvb-t/uk-Carmel
deleted file mode 100644
index 32372c50..00000000
--- a/dvb-t/uk-Carmel
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Carmel
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 825833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Chatton b/dvb-t/uk-Chatton
deleted file mode 100644
index fe42d13c..00000000
--- a/dvb-t/uk-Chatton
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Chatton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Chesterfield b/dvb-t/uk-Chesterfield
deleted file mode 100644
index ae6b88f8..00000000
--- a/dvb-t/uk-Chesterfield
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Chesterfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 626000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Craigkelly b/dvb-t/uk-Craigkelly
deleted file mode 100644
index 63bb5d46..00000000
--- a/dvb-t/uk-Craigkelly
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Craigkelly
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-CrystalPalace b/dvb-t/uk-CrystalPalace
index fc7e55e4..9586b259 100644
--- a/dvb-t/uk-CrystalPalace
+++ b/dvb-t/uk-CrystalPalace
@@ -1,10 +1,3 @@
-# UK, Crystal Palace
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Crystal Palace
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 537833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 505833333 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Darvel b/dvb-t/uk-Darvel
deleted file mode 100644
index 4fa63828..00000000
--- a/dvb-t/uk-Darvel
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Darvel
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 481833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 505833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Divis b/dvb-t/uk-Divis
deleted file mode 100644
index 38363752..00000000
--- a/dvb-t/uk-Divis
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Divis
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 569833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 489833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Dover b/dvb-t/uk-Dover
deleted file mode 100644
index 137b49f3..00000000
--- a/dvb-t/uk-Dover
+++ /dev/null
@@ -1,14 +0,0 @@
-# UK, Dover
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 745833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Dover B
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Durris b/dvb-t/uk-Durris
deleted file mode 100644
index 851f0f3a..00000000
--- a/dvb-t/uk-Durris
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Durris
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Eitshal b/dvb-t/uk-Eitshal
deleted file mode 100644
index 09926561..00000000
--- a/dvb-t/uk-Eitshal
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Eitshal
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 529833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-EmleyMoor b/dvb-t/uk-EmleyMoor
deleted file mode 100644
index 16df648b..00000000
--- a/dvb-t/uk-EmleyMoor
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Emley Moor
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 649833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Fenham b/dvb-t/uk-Fenham
deleted file mode 100644
index f9f3da54..00000000
--- a/dvb-t/uk-Fenham
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Fenham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Fenton b/dvb-t/uk-Fenton
deleted file mode 100644
index 78c78197..00000000
--- a/dvb-t/uk-Fenton
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Fenton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 577833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Ferryside b/dvb-t/uk-Ferryside
deleted file mode 100644
index 20315640..00000000
--- a/dvb-t/uk-Ferryside
+++ /dev/null
@@ -1,8 +0,0 @@
-# UK, Ferryside
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Guildford b/dvb-t/uk-Guildford
deleted file mode 100644
index a5350a0a..00000000
--- a/dvb-t/uk-Guildford
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Guildford
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Hannington b/dvb-t/uk-Hannington
index 30a261a0..0bbbfdd1 100644
--- a/dvb-t/uk-Hannington
+++ b/dvb-t/uk-Hannington
@@ -1,10 +1,3 @@
-# UK, Hannington
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Hannington, North Hampshire
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 626167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Hastings b/dvb-t/uk-Hastings
deleted file mode 100644
index f5f7b712..00000000
--- a/dvb-t/uk-Hastings
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Hastings
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 497833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Heathfield b/dvb-t/uk-Heathfield
deleted file mode 100644
index b65db772..00000000
--- a/dvb-t/uk-Heathfield
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Heathfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 689833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 681833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-HemelHempstead b/dvb-t/uk-HemelHempstead
deleted file mode 100644
index 87fbe865..00000000
--- a/dvb-t/uk-HemelHempstead
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Hemel Hempstead
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-HuntshawCross b/dvb-t/uk-HuntshawCross
deleted file mode 100644
index 9572b293..00000000
--- a/dvb-t/uk-HuntshawCross
+++ /dev/null
@@ -1,13 +0,0 @@
-# UK, Huntshaw Cross
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 737833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 793833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Huntshaw Cross B
-T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Idle b/dvb-t/uk-Idle
deleted file mode 100644
index 84fdc29f..00000000
--- a/dvb-t/uk-Idle
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Idle
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KeelylangHill b/dvb-t/uk-KeelylangHill
deleted file mode 100644
index 3b173759..00000000
--- a/dvb-t/uk-KeelylangHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Keelylang Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Keighley b/dvb-t/uk-Keighley
deleted file mode 100644
index 7db30f49..00000000
--- a/dvb-t/uk-Keighley
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Keighley
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 834000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KilveyHill b/dvb-t/uk-KilveyHill
deleted file mode 100644
index a091be63..00000000
--- a/dvb-t/uk-KilveyHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Kilvey Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 505833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 481833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 529833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 561833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-KnockMore b/dvb-t/uk-KnockMore
deleted file mode 100644
index f6ecb3c9..00000000
--- a/dvb-t/uk-KnockMore
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Knock More
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 578167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 762167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Lancaster b/dvb-t/uk-Lancaster
deleted file mode 100644
index 69b6129e..00000000
--- a/dvb-t/uk-Lancaster
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Lancaster
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-LarkStoke b/dvb-t/uk-LarkStoke
deleted file mode 100644
index a7b7a398..00000000
--- a/dvb-t/uk-LarkStoke
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Lark Stoke
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Limavady b/dvb-t/uk-Limavady
deleted file mode 100644
index 327d3184..00000000
--- a/dvb-t/uk-Limavady
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Limavady
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 769833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 761833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Llanddona b/dvb-t/uk-Llanddona
deleted file mode 100644
index 123c6beb..00000000
--- a/dvb-t/uk-Llanddona
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Llanddona
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Malvern b/dvb-t/uk-Malvern
deleted file mode 100644
index da02f7b2..00000000
--- a/dvb-t/uk-Malvern
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Malvern
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 682000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 658000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Mendip b/dvb-t/uk-Mendip
deleted file mode 100644
index 966d01fa..00000000
--- a/dvb-t/uk-Mendip
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Mendip
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Midhurst b/dvb-t/uk-Midhurst
deleted file mode 100644
index c1a5ceb8..00000000
--- a/dvb-t/uk-Midhurst
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Midhurst
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 778167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 817833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Moel-y-Parc b/dvb-t/uk-Moel-y-Parc
deleted file mode 100644
index 94e4997d..00000000
--- a/dvb-t/uk-Moel-y-Parc
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Moel-y-Parc
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 770000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Nottingham b/dvb-t/uk-Nottingham
deleted file mode 100644
index e94f1c4f..00000000
--- a/dvb-t/uk-Nottingham
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Nottingham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 538000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-OliversMount b/dvb-t/uk-OliversMount
deleted file mode 100644
index 1ad0017c..00000000
--- a/dvb-t/uk-OliversMount
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Oliver's Mount
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 738167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Oxford b/dvb-t/uk-Oxford
index c1799881..035603e3 100644
--- a/dvb-t/uk-Oxford
+++ b/dvb-t/uk-Oxford
@@ -1,26 +1,3 @@
-# UK, Oxford
-#
-# Post-Switchover, found from a mixture of w_scan, trial+error
-# and http://www.ukfree.tv/txdetail.php?a=SP567105
-
-# Local Channels, C51, details still TBA
-T 713833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-
-# PSB1 BBC-A, C53+. Apparently 730.2 but actually looks to be 730.167
-T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# ArqB (COM6), C55, 746.0
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# PSB3 BBC-B, C57, 256QAM DVB-T2, TBA
-# May well be wrong, needs a DVB-T2 tuner to be sure!
-T 762000000 8MHz 2/3 NONE QAM256 8k 1/32 NONE
-
-# ArqA (COM5), C59-, Apparently 777.8 but actually looks to be 777.833
-T 777833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# PSB2, D3+4, C60-, Apparently 785.0 but actually looks to be 785.833
-T 785833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-
-# SDN (COM4), C62, 802.0
-T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+# Oxford
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-PendleForest b/dvb-t/uk-PendleForest
deleted file mode 100644
index 70d21cc4..00000000
--- a/dvb-t/uk-PendleForest
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Pendle Forest
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 545833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Plympton b/dvb-t/uk-Plympton
deleted file mode 100644
index c8c30a85..00000000
--- a/dvb-t/uk-Plympton
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Plympton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 842167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 833833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-PontopPike b/dvb-t/uk-PontopPike
index af1f6a54..c24ba926 100644
--- a/dvb-t/uk-PontopPike
+++ b/dvb-t/uk-PontopPike
@@ -1,10 +1,3 @@
-# UK, Pontop Pike
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Pontop Pike, UK
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 778167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 802167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 690000000 8MHz 1/2 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Pontypool b/dvb-t/uk-Pontypool
deleted file mode 100644
index c258ce8f..00000000
--- a/dvb-t/uk-Pontypool
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Pontypool
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 722000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Presely b/dvb-t/uk-Presely
deleted file mode 100644
index bdfe4f12..00000000
--- a/dvb-t/uk-Presely
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Presely
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 665833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 697833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Redruth b/dvb-t/uk-Redruth
index 8f15fa02..84dcb9a2 100644
--- a/dvb-t/uk-Redruth
+++ b/dvb-t/uk-Redruth
@@ -1,13 +1,3 @@
-# UK, Redruth
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Redruth, Cornwall
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 497833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 521833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 634167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 650167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Reigate b/dvb-t/uk-Reigate
index dd40fbf7..add0d8b2 100644
--- a/dvb-t/uk-Reigate
+++ b/dvb-t/uk-Reigate
@@ -1,10 +1,3 @@
-# UK, Reigate
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Reigate
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 554000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-RidgeHill b/dvb-t/uk-RidgeHill
deleted file mode 100644
index 40e13f4d..00000000
--- a/dvb-t/uk-RidgeHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Ridge Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rosemarkie b/dvb-t/uk-Rosemarkie
deleted file mode 100644
index 36df5819..00000000
--- a/dvb-t/uk-Rosemarkie
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Rosemarkie
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 714167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 657833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rosneath b/dvb-t/uk-Rosneath
deleted file mode 100644
index facbd5c3..00000000
--- a/dvb-t/uk-Rosneath
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Rosneath
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 729833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 761833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 785833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 809833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Rowridge b/dvb-t/uk-Rowridge
index 078d7a14..c0c72a08 100644
--- a/dvb-t/uk-Rowridge
+++ b/dvb-t/uk-Rowridge
@@ -1,10 +1,3 @@
-# UK, Rowridge
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Rowridge, Isle of Wight
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 489833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 545833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 513833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 489833333 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-RumsterForest b/dvb-t/uk-RumsterForest
deleted file mode 100644
index 87941b30..00000000
--- a/dvb-t/uk-RumsterForest
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Rumster Forest
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 530167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 482167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 506167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 562167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 802000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Saddleworth b/dvb-t/uk-Saddleworth
deleted file mode 100644
index dbd037c1..00000000
--- a/dvb-t/uk-Saddleworth
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Saddleworth
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 682000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 633833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 657833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 713833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Salisbury b/dvb-t/uk-Salisbury
deleted file mode 100644
index 87b1c1d1..00000000
--- a/dvb-t/uk-Salisbury
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Salisbury
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 745833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 753833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 777833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 801833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 826000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 721833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-SandyHeath b/dvb-t/uk-SandyHeath
index 8c6cf746..05d0474b 100644
--- a/dvb-t/uk-SandyHeath
+++ b/dvb-t/uk-SandyHeath
@@ -1,10 +1,3 @@
-# UK, Sandy Heath
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Sandy Heath
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 641833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 665833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 650167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 842000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 626167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 674167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+T 641833334 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-Selkirk b/dvb-t/uk-Selkirk
deleted file mode 100644
index 88f5f842..00000000
--- a/dvb-t/uk-Selkirk
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Selkirk
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 730167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 810167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 834167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 754167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Sheffield b/dvb-t/uk-Sheffield
deleted file mode 100644
index 24696118..00000000
--- a/dvb-t/uk-Sheffield
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Sheffield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-StocklandHill b/dvb-t/uk-StocklandHill
deleted file mode 100644
index f89a86d4..00000000
--- a/dvb-t/uk-StocklandHill
+++ /dev/null
@@ -1,9 +0,0 @@
-# UK, Stockland Hill
-# http://www.ukfree.tv/txdetail.php?a=ST222014
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB1
-T 490167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB2
-#T 538167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # PSB3 (DVB-T2)
-T 505833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # COM4
-T 481833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # COM5
-T 529833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # COM6
diff --git a/dvb-t/uk-Storeton b/dvb-t/uk-Storeton
index 8580aaad..5c93ee93 100644
--- a/dvb-t/uk-Storeton
+++ b/dvb-t/uk-Storeton
@@ -1,13 +1,3 @@
-# UK, Storeton
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
+# Storeton, Wirral
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 730000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 546167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Sudbury b/dvb-t/uk-Sudbury
deleted file mode 100644
index 15e5e236..00000000
--- a/dvb-t/uk-Sudbury
+++ /dev/null
@@ -1,12 +0,0 @@
-# UK, Sudbury
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 850000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, Sudbury B
-T 754000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/uk-SuttonColdfield b/dvb-t/uk-SuttonColdfield
deleted file mode 100644
index 67cf07fc..00000000
--- a/dvb-t/uk-SuttonColdfield
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Sutton Coldfield
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 634167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 658167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 682167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 714167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 722167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Tacolneston b/dvb-t/uk-Tacolneston
deleted file mode 100644
index b062cca4..00000000
--- a/dvb-t/uk-Tacolneston
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Tacolneston
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 810000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 786000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 730167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 769833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-TheWrekin b/dvb-t/uk-TheWrekin
deleted file mode 100644
index 435741c1..00000000
--- a/dvb-t/uk-TheWrekin
+++ /dev/null
@@ -1,15 +0,0 @@
-# UK, The Wrekin
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 498167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 522167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-# UK, The Wrekin B
-T 618167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 698000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Torosay b/dvb-t/uk-Torosay
deleted file mode 100644
index 77af3c67..00000000
--- a/dvb-t/uk-Torosay
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Torosay
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 490167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 514167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 538167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 570167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 553833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-TunbridgeWells b/dvb-t/uk-TunbridgeWells
deleted file mode 100644
index 6f57c1b3..00000000
--- a/dvb-t/uk-TunbridgeWells
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Tunbridge Wells
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 642167000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 666167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Waltham b/dvb-t/uk-Waltham
deleted file mode 100644
index bc4ab0ec..00000000
--- a/dvb-t/uk-Waltham
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Waltham
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 698000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 490000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 514000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 570000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-Wenvoe b/dvb-t/uk-Wenvoe
deleted file mode 100644
index 011c5243..00000000
--- a/dvb-t/uk-Wenvoe
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Wenvoe
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 546000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 578000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 625833000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 705833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 649833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 673833000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-WhitehawkHill b/dvb-t/uk-WhitehawkHill
deleted file mode 100644
index 0d343c3f..00000000
--- a/dvb-t/uk-WhitehawkHill
+++ /dev/null
@@ -1,10 +0,0 @@
-# UK, Whitehawk Hill
-# Auto-generated from http://www.dtg.org.uk/retailer/dtt_channels.html
-# and http://www.ofcom.org.uk/static/reception_advice/index.asp.html
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 706000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
-T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 770167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
-T 794167000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/uk-WinterHill b/dvb-t/uk-WinterHill
index 635f227b..b000623d 100644
--- a/dvb-t/uk-WinterHill
+++ b/dvb-t/uk-WinterHill
@@ -1,9 +1,3 @@
-# UK, Winter Hill
-# Populated by J. Hornsby from a scan of active multiplexes
-# UK, Winter Hill B Ceased broadcasting on 02 December 2009
+# Winter Hill, North-West England
# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 746000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 770000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-T 801833000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 754166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/dvb-t/vn-Hanoi b/dvb-t/vn-Hanoi
deleted file mode 100644
index 451a07fc..00000000
--- a/dvb-t/vn-Hanoi
+++ /dev/null
@@ -1,5 +0,0 @@
-# Hanoi - Vietnam - DVB-T by VTC
-# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 514000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
-T 578000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
diff --git a/dvb-t/vn-Thaibinh b/dvb-t/vn-Thaibinh
deleted file mode 100644
index 85f80989..00000000
--- a/dvb-t/vn-Thaibinh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Thaibinh - Vietnam - DVB-T by VTC
-# contributed by Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-T 626000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
-T 634000000 8MHz 3/4 NONE QAM64 2k 1/32 NONE