aboutsummaryrefslogtreecommitdiffstats
path: root/dvb-t
diff options
context:
space:
mode:
Diffstat (limited to 'dvb-t')
-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
686 files changed, 39 insertions, 5939 deletions
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