From 76c5a9110f7ee40fd1c63eca8ca84b125a0ac11e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@kernel.org>
Date: Tue, 30 Jan 2024 17:34:57 +0100
Subject: dvb-s: drop transponders that aren't there at Lyngsat anymore

Those transponders may have been renamed or decommissioned. So,
drop them.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 dvb-s/AMC-11-131.0W                                |  110 -
 dvb-s/AMC-21-&-Galaxy-30-125.0W                    |  199 --
 dvb-s/AMC-21-124.9W                                |   57 -
 dvb-s/Africasat-1a-46.0E                           |  602 ------
 dvb-s/Astra-5B-31.5E                               |  101 -
 dvb-s/Badr-4-26.0E                                 |  462 -----
 dvb-s/Badr-6-26.0E                                 |  130 --
 dvb-s/ChinaSat-6A-125.0E                           |  301 ---
 dvb-s/ChinaSat-6B-115.5E                           |  333 ---
 dvb-s/ChinaSat-6C-130.0E                           |   39 -
 dvb-s/Ciel-2-&-SES-15-129.0W                       | 1163 -----------
 dvb-s/Ciel-2-129.0W                                | 1155 -----------
 dvb-s/EchoStar-9Galaxy-23-121.0W                   |  136 --
 dvb-s/Eutelsat-10A-10.0E                           | 2143 --------------------
 dvb-s/Eutelsat-33E-&-Intelsat-28-33.0E             |  584 ------
 dvb-s/Eutelsat-33E-33.0E                           |  575 ------
 dvb-s/Eutelsat-5-West-A-5.0W                       |  156 --
 dvb-s/Eutelsat-65-West-A-65.0W                     |  165 --
 dvb-s/G-Sat-1030-83.0E                             |  675 ------
 dvb-s/G-Sat-16-55.0E                               |   19 -
 dvb-s/G-Sat-816-&-Yamal-402-55.0E                  |  418 ----
 dvb-s/Galaxy-13Horizons-1-127.0W                   |  165 --
 dvb-s/Galaxy-15-133.0W                             |  135 --
 dvb-s/Galaxy-17-&-Nimiq-6-91.0W                    |  741 -------
 dvb-s/Galaxy-17-91.0W                              |  485 -----
 dvb-s/Galaxy-3C-&-Spaceway-3-&-Intelsat-3031-95.0W |  278 ---
 dvb-s/Galaxy-3C-95.0W                              |  278 ---
 dvb-s/Horizons-2-&-Intelsat-15-85.0E               |  234 ---
 dvb-s/Horizons-2-84.8E                             |   99 -
 dvb-s/Hotbird-13B-13.0E                            |  371 ----
 dvb-s/Hotbird-13C-13.0E                            |  346 ----
 dvb-s/Hotbird-13E-13.0E                            |   30 -
 dvb-s/Intelsat-11-43.1W                            |  495 -----
 dvb-s/Intelsat-15-85.2E                            |  138 --
 dvb-s/Intelsat-25-31.5W                            |   29 -
 dvb-s/Intelsat-38-45.1E                            |  133 --
 dvb-s/Intelsat-905-&-Alcomsat-1-24.5W              |  859 --------
 dvb-s/Intelsat-905-24.5W                           |  807 --------
 dvb-s/Intelsat-906-64.2E                           |   68 -
 dvb-s/Measat-3-91.5E                               |  332 ---
 dvb-s/NSS-5-50.5E                                  |   19 -
 dvb-s/Nilesat-201-&-Eutelsat-7-West-A-7.0W         |  501 -----
 dvb-s/Optus-D1-160.0E                              |  203 --
 dvb-s/Optus-D2-152.0E                              |  161 --
 dvb-s/Star-One-C1-&-Eutelsat-65-West-A-65.0W       |  260 ---
 dvb-s/Star-One-C1-65.0W                            |   98 -
 dvb-s/Star-One-C2-70.0W                            |  675 ------
 dvb-s/Star-One-C2C4-70.0W                          |  774 -------
 dvb-s/T10T12-&-SES-3-103.0W                        |  763 -------
 dvb-s/Trksat-3A4A-42.0E                            | 1357 -------------
 50 files changed, 20357 deletions(-)
 delete mode 100644 dvb-s/AMC-11-131.0W
 delete mode 100644 dvb-s/AMC-21-&-Galaxy-30-125.0W
 delete mode 100644 dvb-s/AMC-21-124.9W
 delete mode 100644 dvb-s/Africasat-1a-46.0E
 delete mode 100644 dvb-s/Astra-5B-31.5E
 delete mode 100644 dvb-s/Badr-4-26.0E
 delete mode 100644 dvb-s/Badr-6-26.0E
 delete mode 100644 dvb-s/ChinaSat-6A-125.0E
 delete mode 100644 dvb-s/ChinaSat-6B-115.5E
 delete mode 100644 dvb-s/ChinaSat-6C-130.0E
 delete mode 100644 dvb-s/Ciel-2-&-SES-15-129.0W
 delete mode 100644 dvb-s/Ciel-2-129.0W
 delete mode 100644 dvb-s/EchoStar-9Galaxy-23-121.0W
 delete mode 100644 dvb-s/Eutelsat-10A-10.0E
 delete mode 100644 dvb-s/Eutelsat-33E-&-Intelsat-28-33.0E
 delete mode 100644 dvb-s/Eutelsat-33E-33.0E
 delete mode 100644 dvb-s/Eutelsat-5-West-A-5.0W
 delete mode 100644 dvb-s/Eutelsat-65-West-A-65.0W
 delete mode 100644 dvb-s/G-Sat-1030-83.0E
 delete mode 100644 dvb-s/G-Sat-16-55.0E
 delete mode 100644 dvb-s/G-Sat-816-&-Yamal-402-55.0E
 delete mode 100644 dvb-s/Galaxy-13Horizons-1-127.0W
 delete mode 100644 dvb-s/Galaxy-15-133.0W
 delete mode 100644 dvb-s/Galaxy-17-&-Nimiq-6-91.0W
 delete mode 100644 dvb-s/Galaxy-17-91.0W
 delete mode 100644 dvb-s/Galaxy-3C-&-Spaceway-3-&-Intelsat-3031-95.0W
 delete mode 100644 dvb-s/Galaxy-3C-95.0W
 delete mode 100644 dvb-s/Horizons-2-&-Intelsat-15-85.0E
 delete mode 100644 dvb-s/Horizons-2-84.8E
 delete mode 100644 dvb-s/Hotbird-13B-13.0E
 delete mode 100644 dvb-s/Hotbird-13C-13.0E
 delete mode 100644 dvb-s/Hotbird-13E-13.0E
 delete mode 100644 dvb-s/Intelsat-11-43.1W
 delete mode 100644 dvb-s/Intelsat-15-85.2E
 delete mode 100644 dvb-s/Intelsat-25-31.5W
 delete mode 100644 dvb-s/Intelsat-38-45.1E
 delete mode 100644 dvb-s/Intelsat-905-&-Alcomsat-1-24.5W
 delete mode 100644 dvb-s/Intelsat-905-24.5W
 delete mode 100644 dvb-s/Intelsat-906-64.2E
 delete mode 100644 dvb-s/Measat-3-91.5E
 delete mode 100644 dvb-s/NSS-5-50.5E
 delete mode 100644 dvb-s/Nilesat-201-&-Eutelsat-7-West-A-7.0W
 delete mode 100644 dvb-s/Optus-D1-160.0E
 delete mode 100644 dvb-s/Optus-D2-152.0E
 delete mode 100644 dvb-s/Star-One-C1-&-Eutelsat-65-West-A-65.0W
 delete mode 100644 dvb-s/Star-One-C1-65.0W
 delete mode 100644 dvb-s/Star-One-C2-70.0W
 delete mode 100644 dvb-s/Star-One-C2C4-70.0W
 delete mode 100644 dvb-s/T10T12-&-SES-3-103.0W
 delete mode 100644 dvb-s/Trksat-3A4A-42.0E

diff --git a/dvb-s/AMC-11-131.0W b/dvb-s/AMC-11-131.0W
deleted file mode 100644
index 1acb0483..00000000
--- a/dvb-s/AMC-11-131.0W
+++ /dev/null
@@ -1,110 +0,0 @@
-# Channel table for AMC 11 at 131.0°W
-# Source: http://www.lyngsat.com/AMC-11.html
-
-[Showtime HD Plex 3]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3740000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GCI]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3940000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ION Media Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 34280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 34280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HITS Quantum]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 34280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Showtime HD West Plex 2]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4100000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 34280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 34280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Univisión]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SES]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/AMC-21-&-Galaxy-30-125.0W b/dvb-s/AMC-21-&-Galaxy-30-125.0W
deleted file mode 100644
index 0b9dd3b4..00000000
--- a/dvb-s/AMC-21-&-Galaxy-30-125.0W
+++ /dev/null
@@ -1,199 +0,0 @@
-# Channel table for AMC 21 & Galaxy 30 at 125.0°W
-# Source: http://www.lyngsat.com/AMC-21-and-Galaxy-30.html
-
-[ABC Cable Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HBO The Works]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3860000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29079000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 34286000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[C-SPAN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HBO The Works]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[AMC Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC Universal]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4100000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 34283000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[A&E Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ShopHQ]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4149000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[A&E Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Showtime HD East Plex 2]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Montana PBS]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11916000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2398000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12146000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12155000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12163000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12169000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[PBS]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/AMC-21-124.9W b/dvb-s/AMC-21-124.9W
deleted file mode 100644
index 03aeb405..00000000
--- a/dvb-s/AMC-21-124.9W
+++ /dev/null
@@ -1,57 +0,0 @@
-# Channel table for AMC 21 at 124.9°W
-# Source: http://www.lyngsat.com/AMC-21.html
-
-[Montana PBS]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11916000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2398000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12146000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12155000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12163000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12169000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[PBS]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Africasat-1a-46.0E b/dvb-s/Africasat-1a-46.0E
deleted file mode 100644
index 84aed2e7..00000000
--- a/dvb-s/Africasat-1a-46.0E
+++ /dev/null
@@ -1,602 +0,0 @@
-# Channel table for AzerSpace 1/Africasat 1a at 46.0°E
-# Source: http://www.lyngsat.com/AzerSpace-1-Africasat-1a.html
-
-[Dira TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GBS TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3833000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1077000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MFM TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3897000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1268000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NCBN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3899000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Salt TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3902000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1054000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Clouds TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3908000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1843000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3930000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3953000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1180000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Silverbird TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3962000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2339000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Plus TV Africa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3993000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1667000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cam 10]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3999000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MFM TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4016000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2111000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Evangel TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4021000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1180000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Celebration TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4024000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1190000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kingdom Life Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4026000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4046000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Channel Ten]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4112000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2132000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Resurrection TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4115000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1010000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Salvation TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4116000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1025000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mwangaza TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4117000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1390000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dunamis TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4119000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1180000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[WRM TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Star TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4122000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2381000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Champions TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4125000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Wasafi TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4127000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2380000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV E]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Clouds TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4132000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1843000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Salvation TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4135000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1282000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Upendo TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4137000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1603000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4145000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4163000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10967000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10968000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10973000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2221000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10978000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10984000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10987000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10987000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10992000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2726000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10998000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2962000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Azercosmos promo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11001000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1054000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11007000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11024000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 16500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ARB Media Qrup]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11024000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 12700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11037000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11042000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11042000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11046000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11046000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11049000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11068000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11068000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11077000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11088000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Georgian mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11095000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Wide Network Solutions]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11104000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11138000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11147000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11174000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Teleradio]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11182000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11187000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Astra-5B-31.5E b/dvb-s/Astra-5B-31.5E
deleted file mode 100644
index 5294315a..00000000
--- a/dvb-s/Astra-5B-31.5E
+++ /dev/null
@@ -1,101 +0,0 @@
-# Channel table for Astra 5B at 31.5°E
-# Source: http://www.lyngsat.com/Astra-5B.html
-
-[SES]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11817000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Magti]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11973000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12012000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SES]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12051000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SES]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12070000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12090000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12168000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12246000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12324000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12402000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Orange România]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12480000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Badr-4-26.0E b/dvb-s/Badr-4-26.0E
deleted file mode 100644
index 29ef8bb8..00000000
--- a/dvb-s/Badr-4-26.0E
+++ /dev/null
@@ -1,462 +0,0 @@
-# Channel table for Badr 4 at 26.0°E
-# Source: http://www.lyngsat.com/Badr-4.html
-
-[Jordan Media City]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11938000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Palsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11958000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Lebanese mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11977000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arabsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11996000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sudanese mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12034000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12054000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arabsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12073000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Twofour54]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12092000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dubai Media]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Saudi Broadcasting Authority]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12149000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Qatar TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12169000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Yemen TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12182000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 16200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bahrain TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12226000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al Kass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12245000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kuwait TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12523000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12523000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12558000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12563000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4440000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TDM]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12563000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12570000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12574000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12580000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12586000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12586000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12591000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12591000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12597000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12600000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12605000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12605000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12608000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1820000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12611000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12618000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12620000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12628000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4440000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12635000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2220000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tunisian mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12643000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12644000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1850000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Future International]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12666000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1660000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12669000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4440000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12672000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12676000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12679000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SNRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12683000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12697000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4440000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12708000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12711000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12717000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2143000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12718000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12722000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12729000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12734000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12736000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12738000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Badr-6-26.0E b/dvb-s/Badr-6-26.0E
deleted file mode 100644
index ea8cf203..00000000
--- a/dvb-s/Badr-6-26.0E
+++ /dev/null
@@ -1,130 +0,0 @@
-# Channel table for Badr 6 at 26.0°E
-# Source: http://www.lyngsat.com/Badr-6.html
-
-[Télé Sahel]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4087000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TNT Niger]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4102000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arabsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11747000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GOBX]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11766000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arabsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11785000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Etisalat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11804000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GMA Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11823000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arabsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11843000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Etisalat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11862000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rotana]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12341000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GOBX]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12399000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SSC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12418000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[IEN Doros]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12437000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Oman TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12456000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al-Majd Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12476000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/ChinaSat-6A-125.0E b/dvb-s/ChinaSat-6A-125.0E
deleted file mode 100644
index 1bfff7d8..00000000
--- a/dvb-s/ChinaSat-6A-125.0E
+++ /dev/null
@@ -1,301 +0,0 @@
-# Channel table for ChinaSat 6A at 125.0°E
-# Source: http://www.lyngsat.com/ChinaSat-6A.html
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Top V]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shanghai Media Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Top V]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3820000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3845000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17778000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Top V]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3854000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hainan Satellite TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3876000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Guangxi TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3885000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5720000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shandong TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3889000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Heilongjiang TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3893000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6880000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Golden Eagle Cartoon]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3901000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3909000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8934000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Chongqing TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3912000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Yunnan TV 1]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3922000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7250000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hainan Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3933000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6590000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shanghai Media Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Heilongjiang TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3951000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tianjin TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Xizang TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3989000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9070000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Anhui TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3993000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9578000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bingtuan Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3999000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4420000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Liaoning TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4420000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sansha TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4013000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4140000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Guangxi TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4033000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9580000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Top V]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jilin TV Station]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4067000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Yunnan TV 1]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4092000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4100000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Xinjiang TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 14800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4145000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jiangsu TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9578000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zhejiang Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9578000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hebei TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4172000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/ChinaSat-6B-115.5E b/dvb-s/ChinaSat-6B-115.5E
deleted file mode 100644
index 9fc41743..00000000
--- a/dvb-s/ChinaSat-6B-115.5E
+++ /dev/null
@@ -1,333 +0,0 @@
-# Channel table for ChinaSat 6B at 115.5°E
-# Source: http://www.lyngsat.com/ChinaSat-6B.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3709000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10920000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hunan mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3750000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10490000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CGTN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3770000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12360000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Qinghai TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3787000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Guizhou TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3796000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6930000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Chongqing TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3807000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shanghai Media Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3808000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Heilongjiang TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3815000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4420000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zhejiang Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6780000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shandong TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shanxi TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3846000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5950000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Henan TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3854000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4420000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ningxia Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3861000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shaanxi mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3871000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9080000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shandong Education TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3885000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jiangxi TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3892000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4420000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sichuan TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3903000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gansu TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3913000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV 7]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17774000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Anhui TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3929000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8840000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tianjin TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5948000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3950000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11406000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Beijing mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3951000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9520000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[JSBC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3971000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CETV 1]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CDM]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SiTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4034000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 19575000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fujian South East TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4067000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9988000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Liaoning TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4092000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9990000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CHC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4100000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4116000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 21374000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shenzhen TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4135000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CDM]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hubei Satellite TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4147000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6150000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Qinghai mux]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4158000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8680000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nei Monggol TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4171000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[China National Radio]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4175000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hebei TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4192000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/ChinaSat-6C-130.0E b/dvb-s/ChinaSat-6C-130.0E
deleted file mode 100644
index 2b52bf3d..00000000
--- a/dvb-s/ChinaSat-6C-130.0E
+++ /dev/null
@@ -1,39 +0,0 @@
-# Channel table for ChinaSat 6C at 130.0°E
-# Source: http://www.lyngsat.com/ChinaSat-6C.html
-
-[CCTV 4K]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15950000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CETV Early Education]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Beijing TV Winter Olympic & Doc Channel tests]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3851000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15950000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV 4K]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Ciel-2-&-SES-15-129.0W b/dvb-s/Ciel-2-&-SES-15-129.0W
deleted file mode 100644
index 96bb1dc3..00000000
--- a/dvb-s/Ciel-2-&-SES-15-129.0W
+++ /dev/null
@@ -1,1163 +0,0 @@
-# Channel table for Ciel 2 & SES 15 at 129.0°W
-# Source: http://www.lyngsat.com/Ciel-2-and-SES-15.html
-
-[Reuters Live]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12122000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12457000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12472000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12501000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12516000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12530000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12545000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12559000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12574000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12588000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12603000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12618000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12632000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12647000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12676000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Ciel-2-129.0W b/dvb-s/Ciel-2-129.0W
deleted file mode 100644
index a2b85ea4..00000000
--- a/dvb-s/Ciel-2-129.0W
+++ /dev/null
@@ -1,1155 +0,0 @@
-# Channel table for Ciel 2 at 129.0°W
-# Source: http://www.lyngsat.com/Ciel-2.html
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12457000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12472000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12501000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12516000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12530000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12545000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12559000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12574000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12588000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12603000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12618000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12632000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12647000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12676000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 21500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/EchoStar-9Galaxy-23-121.0W b/dvb-s/EchoStar-9Galaxy-23-121.0W
deleted file mode 100644
index 77b32df0..00000000
--- a/dvb-s/EchoStar-9Galaxy-23-121.0W
+++ /dev/null
@@ -1,136 +0,0 @@
-# Channel table for EchoStar 9/Galaxy 23 at 121.0°W
-# Source: http://www.lyngsat.com/EchoStar-9-Galaxy-23.html
-
-[CenturyLink]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BabyFirst TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3864000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SES]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3910000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jewish Life TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3926000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The Erotic Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4011000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[IKO MG]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4171000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RTVE]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4192000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11070000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11715000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11724000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11943000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[[EchoStar test card]]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11990000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dish USA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12016000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Veterans Affairs Knowledge Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12096000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12167000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[[EchoStar test card]]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12171000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Eutelsat-10A-10.0E b/dvb-s/Eutelsat-10A-10.0E
deleted file mode 100644
index 85b757af..00000000
--- a/dvb-s/Eutelsat-10A-10.0E
+++ /dev/null
@@ -1,2143 +0,0 @@
-# Channel table for Eutelsat 10A at 10.0°E
-# Source: http://www.lyngsat.com/Eutelsat-10A.html
-
-[StarTimes TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3647000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 18825000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EBC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3650000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 14323000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CIS TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3689000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 1333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3694000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 4387000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TCV Internacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3709000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 1002000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3721000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Burundi mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3724000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1818000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[StarTimes TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3736000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 12902000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[StarTimes TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3748000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 9082000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[StarTimes TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3759000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 7610000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ugandan mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3768000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 8475000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[New World TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3777000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6480000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Djoma TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3783000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2251000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3786000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Deeper Christian Life Ministry]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3826000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 4584000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[LXP TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3835000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1650000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Télé Tchad]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3855000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2062000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3857000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 1032000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3865000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 13333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rwanda TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3869000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3870000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 1000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3886000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3891000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3896000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3901000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3973000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVT International]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4039000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10707000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10712000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4167000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10717000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3215000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fé TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10733000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2025000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10738000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2894000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10742000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2894000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zap Viva Internacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10747000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10759000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2480000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10768000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10794000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10801000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10810000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4430000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10819000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9411000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10831000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Palanca TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10836000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ORTC TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10840000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2061000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10851000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3254000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10856000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10876000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10885000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10899000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10905000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10918000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4430000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10922000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10930000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10953000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10957000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4167000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10959000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10969000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6975000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10976000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10976000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10981000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10981000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10988000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10989000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10994000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10994000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10998000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11003000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Alforat TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11007000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11011000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11013000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4440000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11018000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2142000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11019000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11022000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2650000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11030000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11031000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11041000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11043000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7120000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11048000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11052000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11059000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11059000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11066000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11069000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11078000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11084000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11086000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11089000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11091000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11095000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11099000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6332000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11101000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11106000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7400000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11107000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6332000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NourSat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11112000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al Rasheed TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11114000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11125000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11129000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9874000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11133000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11137000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11140000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11144000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11146000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3214000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11149000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11156000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11158000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11163000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11164000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11169000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11169000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11173000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11180000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11188000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11190000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11205000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BFBS]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11221000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11290000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11299000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11308000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11317000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[AFP TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11346000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11375000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9874000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11399000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9874000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11415000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11429000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 34000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11438000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11438000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Libya Alrasmia Channel]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11482000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2857000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Iraq 24]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11486000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11500000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11501000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9230000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11506000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11509000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11513000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9230000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11518000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11527000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11534000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11538000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11539000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11545000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2142000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11545000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[M24 TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11547000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1442000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11548000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11552000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11554000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11556000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11560000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11565000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ennahar TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11568000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11569000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11571000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11604000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kurdistan TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11624000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zagros TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11628000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11635000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11636000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ava Entertainment]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11639000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3650000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11643000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3550000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kurdistan 24]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11644000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11647000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3550000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11648000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11650000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3550000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11655000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11656000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11658000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11661000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11662000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11664000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2480000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11664000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11670000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Zimbo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11676000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11153000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11677000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Alikhbaria Syria]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11681000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11683000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11685000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sama TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11688000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1851000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11691000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11692000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11696000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2980000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11697000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12507000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12508000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12513000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3692000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12525000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4936000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nessma]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12535000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1515000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12548000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12551000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12553000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12556000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12558000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12563000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12568000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12570000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3111000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12576000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12590000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12593000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12593000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12596000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12599000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12602000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12603000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12605000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12610000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1852000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12611000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12620000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12620000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12629000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3204000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12634000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12637000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[APTN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12637000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12649000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3254000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12654000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3254000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12654000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12658000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3214000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12673000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Radio Maria Italia]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12676000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 256000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12679000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2894000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12680000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12684000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12688000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12693000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12694000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12697000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12703000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12706000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12708000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4937000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12711000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12717000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12723000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4610000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12725000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12729000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3325000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12733000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12734000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12739000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12741000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12742000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Eutelsat-33E-&-Intelsat-28-33.0E b/dvb-s/Eutelsat-33E-&-Intelsat-28-33.0E
deleted file mode 100644
index b2c3efcc..00000000
--- a/dvb-s/Eutelsat-33E-&-Intelsat-28-33.0E
+++ /dev/null
@@ -1,584 +0,0 @@
-# Channel table for Eutelsat 33E & Intelsat 28 at 33.0°E
-# Source: http://www.lyngsat.com/Eutelsat-33E-and-Intelsat-28.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10758000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10799000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10805000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10811000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10818000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10821000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10830000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10830000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10839000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10848000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10968000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10974000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[UAU!TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11043000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11089000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11123000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11150000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8888000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11156000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11161000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11166000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11167000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11173000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11181000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11185000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11187000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11191000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11193000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Skylogic]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11350000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15710000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11572000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11578000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11583000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11589000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11610000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11616000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11649000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11657000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11666000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11696000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12508000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12517000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12525000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12533000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12541000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12557000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3820000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12571000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12582000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12588000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12598000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10057000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12603000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12605000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12622000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12628000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom DTT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12646000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 210115000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12658000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12678000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12688000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12693000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12716000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mobilna]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12722000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16730000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Eutelsat-33E-33.0E b/dvb-s/Eutelsat-33E-33.0E
deleted file mode 100644
index a7b42b39..00000000
--- a/dvb-s/Eutelsat-33E-33.0E
+++ /dev/null
@@ -1,575 +0,0 @@
-# Channel table for Eutelsat 33E at 33.0°E
-# Source: http://www.lyngsat.com/Eutelsat-33E.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10758000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10799000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10805000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10811000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10818000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10821000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10830000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10830000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10839000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10848000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10968000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10974000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11025000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11043000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11089000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11123000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11150000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8888000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11156000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11161000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11166000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11167000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11173000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11181000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11185000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11187000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11191000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11193000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Skylogic]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11350000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15710000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11572000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11578000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11583000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11589000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11610000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11616000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4680000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11649000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11657000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11666000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11696000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12508000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12517000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12525000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12533000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12541000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12557000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3820000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12571000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12582000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12588000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12598000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10057000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12603000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12605000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12622000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12628000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom DTT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12646000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 210115000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12658000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12678000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12688000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12693000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12716000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mobilna]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12722000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16730000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Eutelsat-5-West-A-5.0W b/dvb-s/Eutelsat-5-West-A-5.0W
deleted file mode 100644
index d72128f8..00000000
--- a/dvb-s/Eutelsat-5-West-A-5.0W
+++ /dev/null
@@ -1,156 +0,0 @@
-# Channel table for Eutelsat 5 West A at 5.0°W
-# Source: http://www.lyngsat.com/Eutelsat-5-West-A.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4017000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 9700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4030000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 9700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4048000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 9873000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4060000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6667000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4077000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3100000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4137000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2143000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11031000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11043000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6975000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11061000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6975000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11070000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6975000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11536000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11542000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11548000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11554000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11560000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11569000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11644000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Eutelsat-65-West-A-65.0W b/dvb-s/Eutelsat-65-West-A-65.0W
deleted file mode 100644
index 519e8fc2..00000000
--- a/dvb-s/Eutelsat-65-West-A-65.0W
+++ /dev/null
@@ -1,165 +0,0 @@
-# Channel table for Eutelsat 65 West A at 65.0°W
-# Source: http://www.lyngsat.com/Eutelsat-65-West-A.html
-
-[Rede Centro Oeste]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4506000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Assembleia Paraná]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4510000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Cachoeira]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4566000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Atalaia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4614000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Speedcast tests]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4650000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18080000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM Bauru]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4686000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Band Triângulo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4692000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM São José do Rio Preto]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4696000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Integração Zona da Mata]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4698000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6668000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM Itapetininga]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4704000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Integração Ituiutaba]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4705000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVE Bahia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4712000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4780000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10720000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10760000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10915000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11428000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11220000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11220000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11260000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/G-Sat-1030-83.0E b/dvb-s/G-Sat-1030-83.0E
deleted file mode 100644
index a94989f2..00000000
--- a/dvb-s/G-Sat-1030-83.0E
+++ /dev/null
@@ -1,675 +0,0 @@
-# Channel table for G-Sat 10/30 at 83.0°E
-# Source: http://www.lyngsat.com/G-Sat-10-30.html
-
-[ETV Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3725000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DD Uttarakhand]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3750000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DD Chhattisgarh]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3753000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Indiasign]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3756000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DD Jharkhand]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3757000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3762000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SVBC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3767000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DD Hissar]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3769000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3774000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Indiasign]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3776000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Planetcast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3805000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3831000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3842000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3845000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Prameya News 7]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3847000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kasthuri TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3858000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6920000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3861000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3974000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mega TV Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3870000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3874000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sakshi TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3883000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Doordarshan]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3885000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3887000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3663000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vanitha TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3892000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Planetcast]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3898000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Planetcast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Brahmaputra Tele Productions]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3949000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3672000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3958000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zee Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3976000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3981000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4216000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ETV Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4005000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mh One TV Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4030000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4440000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zee Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Lamhas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13230000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun 18 Media Services]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4071000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4073000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4079000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zee Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4090000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BBS]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4100000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4108000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4108000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4113000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Manorama News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4114000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[AIR Dehradun]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4115000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 320000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[AIR FM Rainbow Delhi]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4116000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4121000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[AIR Vijayawada]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4123000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 320000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4127000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BAG Network 24]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4133000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11888000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Zee Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4156000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Lok Sabha TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4170000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4650000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ETV Telugu]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kolkata TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4181000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3232000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11470000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11470000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11510000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11510000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11550000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11550000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11590000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11590000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11630000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11630000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11670000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tata Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11670000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/G-Sat-16-55.0E b/dvb-s/G-Sat-16-55.0E
deleted file mode 100644
index 2d9bf4b1..00000000
--- a/dvb-s/G-Sat-16-55.0E
+++ /dev/null
@@ -1,19 +0,0 @@
-# Channel table for G-Sat 16 at 55.0°E
-# Source: http://www.lyngsat.com/G-Sat-16.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4168000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4175000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/G-Sat-816-&-Yamal-402-55.0E b/dvb-s/G-Sat-816-&-Yamal-402-55.0E
deleted file mode 100644
index 91f0d259..00000000
--- a/dvb-s/G-Sat-816-&-Yamal-402-55.0E
+++ /dev/null
@@ -1,418 +0,0 @@
-# Channel table for G-Sat 8/16 & Yamal 402 at 55.0°E
-# Source: http://www.lyngsat.com/G-Sat-8-16-and-Yamal-402.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4168000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4175000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ KiteNet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10845000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 0
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[[test card]]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10885000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3255000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TPA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10962000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5926000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10967000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2951000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10967000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2951000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[T-Sat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10968000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11630000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10972000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2951000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10972000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2951000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10976000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2951000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Winners Golden Bet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10980000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11030000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telemedia]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11045000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 40000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11186000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8495000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11215000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11225000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11232000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gazprom Space Systems]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11265000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ HeliosNet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11340000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gazprom Space Systems]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11345000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11385000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11425000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ KB Impuls]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11486000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11532000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11550000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11686000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gazprom Space Systems]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12522000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Connecto TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12531000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12542000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3320000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12547000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3320000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12588000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12603000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12630000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12636000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12637000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12641000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12644000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RSCC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12649000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12652000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12665000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RSCC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15284000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RSCC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12694000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15284000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12706000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2830000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RSCC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12714000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10260000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ Gazprom Space Systems Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12730000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-13Horizons-1-127.0W b/dvb-s/Galaxy-13Horizons-1-127.0W
deleted file mode 100644
index b81301b1..00000000
--- a/dvb-s/Galaxy-13Horizons-1-127.0W
+++ /dev/null
@@ -1,165 +0,0 @@
-# Channel table for Galaxy 13/Horizons 1 at 127.0°W
-# Source: http://www.lyngsat.com/Galaxy-13-Horizons-1.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Starz]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3880000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NASA TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3920000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28068000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Encompass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3960000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Starz]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Herring Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4052000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Apostolic Oneness Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4066000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3310000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MBC America]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4070000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3257000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4080000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NFL]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Encompass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11727000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12050000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13020000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12087000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ HughesNet]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16278000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-15-133.0W b/dvb-s/Galaxy-15-133.0W
deleted file mode 100644
index 3074e7bf..00000000
--- a/dvb-s/Galaxy-15-133.0W
+++ /dev/null
@@ -1,135 +0,0 @@
-# Channel table for Galaxy 15 at 133.0°W
-# Source: http://www.lyngsat.com/Galaxy-15.html
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3820000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Starz]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3860000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Starz]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Media-Comm]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4044000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HBO The Works]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HBO The Works]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EWTN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4150000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11936000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4166000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EWTN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4168000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 16303000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-17-&-Nimiq-6-91.0W b/dvb-s/Galaxy-17-&-Nimiq-6-91.0W
deleted file mode 100644
index 4f2ea68e..00000000
--- a/dvb-s/Galaxy-17-&-Nimiq-6-91.0W
+++ /dev/null
@@ -1,741 +0,0 @@
-# Channel table for Galaxy 17 & Nimiq 6 at 91.0°W
-# Source: http://www.lyngsat.com/Galaxy-17-and-Nimiq-6.html
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The Word Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3774000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Comcast Entertainment Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3860000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BYU TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4249000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[KLUZ-TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3934000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2480000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Roberts Communications Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3947000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MASN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3951000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TCT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3966000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The Word Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4066000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The CW Plus]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4084000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 21600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4134000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6960000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[International Media Distribution]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ HughesNet]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11913000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11930000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11935000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11945000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11950000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11952000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5859000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11955000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11973000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11985000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11987000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11990000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11995000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11995000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12025000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12030000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12035000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12076000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12115000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13235000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12128000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12135000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12138000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12141000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12145000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12151000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12154000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12224000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12239000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12253000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12268000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12282000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12297000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12311000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12326000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12341000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12355000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12370000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12384000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12414000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12428000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12443000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12457000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12472000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12486000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12501000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12516000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12530000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12545000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12559000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12574000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12588000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12603000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12618000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12632000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12647000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12661000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bell TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12676000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-17-91.0W b/dvb-s/Galaxy-17-91.0W
deleted file mode 100644
index d4af4825..00000000
--- a/dvb-s/Galaxy-17-91.0W
+++ /dev/null
@@ -1,485 +0,0 @@
-# Channel table for Galaxy 17 at 91.0°W
-# Source: http://www.lyngsat.com/Galaxy-17.html
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The Word Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3774000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Comcast Entertainment Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3860000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BYU TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4249000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[KLUZ-TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3934000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2480000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Roberts Communications Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3947000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MASN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3951000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TCT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3966000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The Word Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4066000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[The CW Plus]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4084000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 21600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4134000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6960000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bally Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[International Media Distribution]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ HughesNet]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11740000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11913000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11930000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11935000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11945000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11950000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11952000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5859000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11955000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11973000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11985000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11987000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11990000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11995000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11995000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12025000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12030000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12035000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3979000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12076000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12115000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13235000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12128000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12135000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12138000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12141000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12145000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12151000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12154000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5632000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-3C-&-Spaceway-3-&-Intelsat-3031-95.0W b/dvb-s/Galaxy-3C-&-Spaceway-3-&-Intelsat-3031-95.0W
deleted file mode 100644
index 08409fb6..00000000
--- a/dvb-s/Galaxy-3C-&-Spaceway-3-&-Intelsat-3031-95.0W
+++ /dev/null
@@ -1,278 +0,0 @@
-# Channel table for Galaxy 3C & Spaceway 3 & Intelsat 30/31 at 95.0°W
-# Source: http://www.lyngsat.com/Galaxy-3C-and-Spaceway-3-and-Intelsat-30-31.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3785000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6922000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3827000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6922000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3829000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3884000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3889000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3893000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3896000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3901000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1836000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3911000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3924000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3929000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3935000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3943000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3950000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3956000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3302000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3974000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3984000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3988000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3992000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3996000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4031000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14035000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20760000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12110000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Galaxy-3C-95.0W b/dvb-s/Galaxy-3C-95.0W
deleted file mode 100644
index de5a0896..00000000
--- a/dvb-s/Galaxy-3C-95.0W
+++ /dev/null
@@ -1,278 +0,0 @@
-# Channel table for Galaxy 3C at 95.0°W
-# Source: http://www.lyngsat.com/Galaxy-3C.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3785000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6922000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3827000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6922000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3829000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3884000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3889000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3893000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3896000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3901000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1836000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3911000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3924000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3929000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3935000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3940000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3943000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3950000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3956000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3302000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3974000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3984000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1035000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3988000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3992000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3996000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3074000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4031000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14035000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 31250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20760000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12110000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Horizons-2-&-Intelsat-15-85.0E b/dvb-s/Horizons-2-&-Intelsat-15-85.0E
deleted file mode 100644
index 20a30929..00000000
--- a/dvb-s/Horizons-2-&-Intelsat-15-85.0E
+++ /dev/null
@@ -1,234 +0,0 @@
-# Channel table for Horizons 2 & Intelsat 15 at 85.0°E
-# Source: http://www.lyngsat.com/Horizons-2-and-Intelsat-15.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10969000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10980000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kurdsat News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10995000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hona Baghdad TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11466000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11468000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11470000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11479000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11483000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11559000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11588000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11594000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11687000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12504000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4217000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12560000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12600000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12640000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Horizons-2-84.8E b/dvb-s/Horizons-2-84.8E
deleted file mode 100644
index 1993b02e..00000000
--- a/dvb-s/Horizons-2-84.8E
+++ /dev/null
@@ -1,99 +0,0 @@
-# Channel table for Horizons 2 at 84.8°E
-# Source: http://www.lyngsat.com/Horizons-2.html
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11800000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11920000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Hotbird-13B-13.0E b/dvb-s/Hotbird-13B-13.0E
deleted file mode 100644
index cf6e2843..00000000
--- a/dvb-s/Hotbird-13B-13.0E
+++ /dev/null
@@ -1,371 +0,0 @@
-# Channel table for Hotbird 13B at 13.0°E
-# Source: http://www.lyngsat.com/Hotbird-13B.html
-
-[SES]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10815000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SRG SSR]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10971000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Media Broadcast Satellite]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Media Broadcast Satellite]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11075000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[M-Three satcom]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11541000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11566000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11623000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bis TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11681000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11727000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11785000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nova]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11823000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11843000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11862000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11881000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11900000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nova]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11938000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11977000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11996000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12034000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12073000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12092000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nova]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[M-Three satcom]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12149000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Nova]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12169000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12188000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[VoA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12226000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12265000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12284000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12303000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12322000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12341000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12360000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Etisalat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12399000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12418000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Xtra TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12437000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Italia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12466000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12476000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[STN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12520000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12597000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Hotbird-13C-13.0E b/dvb-s/Hotbird-13C-13.0E
deleted file mode 100644
index 616df9ad..00000000
--- a/dvb-s/Hotbird-13C-13.0E
+++ /dev/null
@@ -1,346 +0,0 @@
-# Channel table for Hotbird 13C at 13.0°E
-# Source: http://www.lyngsat.com/Hotbird-13C.html
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10719000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10758000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10796000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SNRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10873000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10892000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10911000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10930000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RAI]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10992000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RAI]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11013000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11034000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kabelio]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11096000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11117000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arqiva]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11137000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cyfrowy Polsat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11158000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telespazio]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11179000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Xtra TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11219000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11240000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11278000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11296000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Arqiva]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11334000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11373000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11393000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11411000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11449000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Platforma Canal +]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11488000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11508000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SRG SSR]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11526000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CCTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11585000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[M-Three satcom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11642000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telespazio]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11662000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11747000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RAI]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11766000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mediaset]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11919000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telespazio]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12111000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12539000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Saudi Broadcasting Authority]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12558000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12577000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mediawan Thematics]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12692000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Hotbird-13E-13.0E b/dvb-s/Hotbird-13E-13.0E
deleted file mode 100644
index db6e5cc5..00000000
--- a/dvb-s/Hotbird-13E-13.0E
+++ /dev/null
@@ -1,30 +0,0 @@
-# Channel table for Hotbird 13E at 13.0°E
-# Source: http://www.lyngsat.com/Hotbird-13E.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10727000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[IRIB]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10775000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Mediaset]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11432000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-11-43.1W b/dvb-s/Intelsat-11-43.1W
deleted file mode 100644
index 412d4c3c..00000000
--- a/dvb-s/Intelsat-11-43.1W
+++ /dev/null
@@ -1,495 +0,0 @@
-# Channel table for Intelsat 11 at 43.1°W
-# Source: http://www.lyngsat.com/Intelsat-11.html
-
-[Star Premium]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3718000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3743000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21610000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Encompass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3772000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3799000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3803000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Teletica 7]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Win Sports]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3829000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TeleAmazonas]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3829000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[WooHoo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3838000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Paraguayan mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fish TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3848000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3855000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3861000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Overon America]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3864000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17140000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Evangelizar]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3867000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cholusat Sur 36]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3877000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1546000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Star Premium]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3895000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 20200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Televisa Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3901000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Star Premium]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3913000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3962000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Discovery Channel]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3966000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claxson]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3985000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Perú Internacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4004000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3915000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4012000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6650000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Artear]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4026000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18530000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CNN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Artear]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4053000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23780000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Bloomberg TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4086000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fundação Padre Anchieta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4112000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 14800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4124000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Internacional de TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4136000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1667000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4144000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 17400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Box Brazil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4149000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 20083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4168000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4169000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[IKO MG]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4185000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20709000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4192000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10722000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10722000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10802000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10802000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10882000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10882000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10970000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11050000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 28000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11222000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11222000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11302000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11302000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11382000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky Brazil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11382000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-15-85.2E b/dvb-s/Intelsat-15-85.2E
deleted file mode 100644
index 3a12f33c..00000000
--- a/dvb-s/Intelsat-15-85.2E
+++ /dev/null
@@ -1,138 +0,0 @@
-# Channel table for Intelsat 15 at 85.2°E
-# Source: http://www.lyngsat.com/Intelsat-15.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10969000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10980000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2220000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kurdsat News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10995000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Hona Baghdad TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11466000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11468000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11470000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11479000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11483000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11559000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11588000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11594000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11687000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12504000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4217000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12560000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12600000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telekarta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12640000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-25-31.5W b/dvb-s/Intelsat-25-31.5W
deleted file mode 100644
index 39b4741c..00000000
--- a/dvb-s/Intelsat-25-31.5W
+++ /dev/null
@@ -1,29 +0,0 @@
-# Channel table for Intelsat 25 at 31.5°W
-# Source: http://www.lyngsat.com/Intelsat-25.html
-
-[ORTM 1]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4114000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5300000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Cherifla TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12284000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SMTD]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12339000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8573000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-38-45.1E b/dvb-s/Intelsat-38-45.1E
deleted file mode 100644
index 954af9d5..00000000
--- a/dvb-s/Intelsat-38-45.1E
+++ /dev/null
@@ -1,133 +0,0 @@
-# Channel table for AzerSpace 2/Intelsat 38 at 45.1°E
-# Source: http://www.lyngsat.com/AzerSpace-2-Intelsat-38.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11368000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11475000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11475000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 32000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11515000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23700000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[View Satellite Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11555000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11555000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11555000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11595000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11635000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dialog TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11675000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27690000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12520000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12560000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Vivacom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12600000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12689000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12710000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 0
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-905-&-Alcomsat-1-24.5W b/dvb-s/Intelsat-905-&-Alcomsat-1-24.5W
deleted file mode 100644
index 7d5cf087..00000000
--- a/dvb-s/Intelsat-905-&-Alcomsat-1-24.5W
+++ /dev/null
@@ -1,859 +0,0 @@
-# Channel table for Intelsat 905 & Alcomsat 1 at 24.5°W
-# Source: http://www.lyngsat.com/Intelsat-905-and-Alcomsat-1.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3648000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3829000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6110000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4061000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2848000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4068000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2915000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4095000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 28432000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4162000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4168000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 3100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4181000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4192000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6650000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10963000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4440000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10976000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10982000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10983000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10987000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10988000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10993000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10994000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10998000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11004000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11013000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11014000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11019000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11023000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11028000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4280000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11041000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11042000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11045000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11046000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11049000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11060000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11071000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11072000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11079000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11084000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11084000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11090000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11095000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11096000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11103000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11108000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4445000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11109000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11121000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11126000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11134000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11139000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11144000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11157000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11162000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11167000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11171000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3516000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11177000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11188000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11193000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11455000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3450000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11465000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2333000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11473000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4830000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11476000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1080000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11488000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11509000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11518000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11528000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3303000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11540000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11546000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ AOL Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11555000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11574000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9874000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11580000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11589000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11598000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11608000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11620000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11626000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11638000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11638000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11647000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ AOL Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11675000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TDA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TDA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12230000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15910000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TDA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12250000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12510000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Algerian mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12360000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12728000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5135000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12735000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5135000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-905-24.5W b/dvb-s/Intelsat-905-24.5W
deleted file mode 100644
index 34d80b4e..00000000
--- a/dvb-s/Intelsat-905-24.5W
+++ /dev/null
@@ -1,807 +0,0 @@
-# Channel table for Intelsat 905 at 24.5°W
-# Source: http://www.lyngsat.com/Intelsat-905.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3648000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3829000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6110000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4061000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2848000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4068000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2915000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4095000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 28432000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4162000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4168000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 3100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4181000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4192000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2100000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6650000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10963000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10975000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4440000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10976000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10982000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10983000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10987000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10988000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10993000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10994000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10998000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11004000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11013000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11014000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11019000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11023000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11028000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4280000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11041000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11042000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11045000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11046000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11049000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6620000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11060000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11060000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11071000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11072000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11076000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11079000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11084000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11084000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11090000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11095000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11096000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11103000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11108000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4445000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11109000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11121000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11126000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11134000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11139000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11144000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11148000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11152000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11157000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11162000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11167000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 16000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11171000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3516000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11177000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11188000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11193000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4666000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11455000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3450000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11465000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2333000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11473000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4830000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11476000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1080000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11488000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11509000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11518000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11528000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3303000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11540000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11546000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ AOL Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11555000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11574000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 9874000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11580000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11589000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11598000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11608000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7120000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11620000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11626000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 14250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11638000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4875000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11638000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 21000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11647000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[@ AOL Internet]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11675000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Intelsat-906-64.2E b/dvb-s/Intelsat-906-64.2E
deleted file mode 100644
index c5a60067..00000000
--- a/dvb-s/Intelsat-906-64.2E
+++ /dev/null
@@ -1,68 +0,0 @@
-# Channel table for Intelsat 906 at 64.2°E
-# Source: http://www.lyngsat.com/Intelsat-906.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3760000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2790000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Star TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3884000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 4900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Agape TV Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3900000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 3800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TBN Namibia]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4039000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2034000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[One Africa TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4044000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2848000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Channel Ten]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4066000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 2848000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MTN Worldwide TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4135000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4185000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 2532000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Measat-3-91.5E b/dvb-s/Measat-3-91.5E
deleted file mode 100644
index 75dc54c3..00000000
--- a/dvb-s/Measat-3-91.5E
+++ /dev/null
@@ -1,332 +0,0 @@
-# Channel table for Measat 3 at 91.5°E
-# Source: http://www.lyngsat.com/Measat-3.html
-
-[Unire Sat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3708000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2090000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3714000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7984000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DZRH News TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3720000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kapatid International]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3724000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3030000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Encompass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3760000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3784000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3255000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVK]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3791000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4166000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3798000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tellytrack]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3805000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5064000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3816000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3869000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3111000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3876000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3986000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3998000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2963000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CNN Philippines]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4004000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Solar Entertainment]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4014000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4030000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4038000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Globecast]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10982000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11022000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11062000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11102000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11142000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11182000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11482000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11522000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11562000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11602000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11642000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Astro]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11682000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun Direct]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12316000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun Direct]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12436000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun Direct]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12563000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun Direct]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12603000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sun Direct]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12643000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 32000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/NSS-5-50.5E b/dvb-s/NSS-5-50.5E
deleted file mode 100644
index a946b5b1..00000000
--- a/dvb-s/NSS-5-50.5E
+++ /dev/null
@@ -1,19 +0,0 @@
-# Channel table for NSS 5 at 50.5°E
-# Source: http://www.lyngsat.com/NSS-5.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4172000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 13330000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Thaicom promo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12710000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 26670000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Nilesat-201-&-Eutelsat-7-West-A-7.0W b/dvb-s/Nilesat-201-&-Eutelsat-7-West-A-7.0W
deleted file mode 100644
index 72da7824..00000000
--- a/dvb-s/Nilesat-201-&-Eutelsat-7-West-A-7.0W
+++ /dev/null
@@ -1,501 +0,0 @@
-# Channel table for Nilesat 201 & Eutelsat 7 West A at 7.0°W
-# Source: http://www.lyngsat.com/Nilesat-201-and-Eutelsat-7-West-A.html
-
-[Gulfsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10727000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Viewsat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10815000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Qatar TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[On TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10853000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10873000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10892000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10922000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Algerian mux]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10992000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11034000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SNRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11158000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11258000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11277000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rotana]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11296000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11315000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[STN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11354000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11373000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11392000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11411000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DMC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11449000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SNRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11475000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SNRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11514000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11526000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MBC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11559000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Eutelsat MENA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11603000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11626000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2142000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11641000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ONT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11658000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TDA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11680000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11727000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ERTU]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11747000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11766000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11785000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11804000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11823000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ERTU]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11843000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[On TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11862000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11881000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Al Kass]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11919000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11938000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jordan Media City]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11958000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11977000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11996000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12015000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12034000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12054000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[OSN]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12073000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DMC]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12092000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Oman TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Oman TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Saudi Broadcasting Authority]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12149000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12207000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12226000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Saudi Broadcasting Authority]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12284000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12303000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12322000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Du]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12360000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jordan Media City]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12399000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dubai Media]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12418000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Abu Dhabi TV Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12467000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Optus-D1-160.0E b/dvb-s/Optus-D1-160.0E
deleted file mode 100644
index e5503e76..00000000
--- a/dvb-s/Optus-D1-160.0E
+++ /dev/null
@@ -1,203 +0,0 @@
-# Channel table for Optus D1 at 160.0°E
-# Source: http://www.lyngsat.com/Optus-D1.html
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12267000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12295000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12331000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12358000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12394000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12421000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12430000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6111000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Freeview]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12456000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ABC NSW, ABC SA, ABC NT, ABC WA, ABC Victoria, ABC Queensland]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12470000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 47300000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Freeview]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12483000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12519000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBS Victoria, SBS WA, SBS Tasmania, SBS NSW, SBS Queensland, SBS SA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12532000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 47300000
-	MODULATION = APSK/16
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12546000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12581000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12608000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12643000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12644000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12661000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12670000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12671000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12679000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12707000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Sky New Zealand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12734000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Optus-D2-152.0E b/dvb-s/Optus-D2-152.0E
deleted file mode 100644
index 6394ad54..00000000
--- a/dvb-s/Optus-D2-152.0E
+++ /dev/null
@@ -1,161 +0,0 @@
-# Channel table for Optus D2 at 152.0°E
-# Source: http://www.lyngsat.com/Optus-D2.html
-
-[ABC Sydney]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12295000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1644000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12469000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6670000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telstra Broadcast Services]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12519000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Telstra Broadcast Services]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12546000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SES]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12608000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12635000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12643000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12661000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12670000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12679000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12697000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12706000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12714000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12715000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12723000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12736000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3580000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12740000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3580000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12745000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3580000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Star-One-C1-&-Eutelsat-65-West-A-65.0W b/dvb-s/Star-One-C1-&-Eutelsat-65-West-A-65.0W
deleted file mode 100644
index 2d9a643a..00000000
--- a/dvb-s/Star-One-C1-&-Eutelsat-65-West-A-65.0W
+++ /dev/null
@@ -1,260 +0,0 @@
-# Channel table for Star One C1 & Eutelsat 65 West A at 65.0°W
-# Source: http://www.lyngsat.com/Star-One-C1-and-Eutelsat-65-West-A.html
-
-[TV Vila Real]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3792000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3393000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CineBrasil TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3825000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3854000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas Belém]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3858000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Turfe]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3956000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4289000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mais Família]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3991000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4686000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jockey Club de São Paulo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV A Crítica]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4085000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Alterosa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4128000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Ines]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4170000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Centro Oeste]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4506000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Assembleia Paraná]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4510000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Cachoeira]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4566000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5083000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Atalaia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4614000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Speedcast tests]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4650000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 18080000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM Bauru]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4686000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Band Triângulo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4692000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3720000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM São José do Rio Preto]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4696000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Integração Zona da Mata]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4698000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6668000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV TEM Itapetininga]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4704000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7072000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Integração Ituiutaba]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4705000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVE Bahia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4712000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4780000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10720000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10760000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10915000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 11428000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11220000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11220000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[BluTV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11260000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Star-One-C1-65.0W b/dvb-s/Star-One-C1-65.0W
deleted file mode 100644
index 80d14c6d..00000000
--- a/dvb-s/Star-One-C1-65.0W
+++ /dev/null
@@ -1,98 +0,0 @@
-# Channel table for Star One C1 at 65.0°W
-# Source: http://www.lyngsat.com/Star-One-C1.html
-
-[TV Vila Real]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3792000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3393000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CineBrasil TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3825000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3854000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas Belém]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3858000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Turfe]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3956000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4289000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mais Família]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3991000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4686000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Jockey Club de São Paulo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4340000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV A Crítica]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4085000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Alterosa]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4128000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Ines]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4170000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Star-One-C2-70.0W b/dvb-s/Star-One-C2-70.0W
deleted file mode 100644
index 1ad61116..00000000
--- a/dvb-s/Star-One-C2-70.0W
+++ /dev/null
@@ -1,675 +0,0 @@
-# Channel table for Star One C2 at 70.0°W
-# Source: http://www.lyngsat.com/Star-One-C2.html
-
-[TV Assembleia Legislativa do Estado de Mato Grosso]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3645000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Super]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3648000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal do Criador]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3652000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Brasil Central]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3656000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal Rural]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3660000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Evangelizar]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3664000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2980000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Milagro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3665000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2544000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Vida]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3685000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas Belém]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3693000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Polishop]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3696000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede TV!]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3700000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Novo Tempo Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3711000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3715000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Verdes Mares Cariri]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3734000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Horizonte]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3744000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBT Nacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3744000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Brasil 2]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3747000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBT Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3753000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7390000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3756000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Terra Viva]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3762000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Band Nacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3768000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shoptime]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3777000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RPC TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3808000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Morena Campo Grande]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3816000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Centro América Cuiabá]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Bahia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3875000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Anhanguera Goiânia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3887000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RBS TV Porto Alegre]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3905000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Globo São Paulo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3914000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mundo Maior]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3922000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2727000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Justiça]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3328000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EPTV Sul de Minas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Câmara]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3931000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3542000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EPTV Campinas e região]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3933000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Senado]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3935000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3214000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3948000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 17500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Diário]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3950000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2916000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Ceará]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3955000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBN International]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3959000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1875000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mirante]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3965000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Escola]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4069000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Assembléia Ceará]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1852000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Verdes Mares]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3973000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede CNT Satélite]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3974000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Uninter]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3978000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3617000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Aparecida]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3982000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4573000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Paraná Turismo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3985000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Grupo Bandeirantes]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3990000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3993000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12416000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gazeta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3996000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2520000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Minas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4033000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Liberal]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4045000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NSC TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4047000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4052000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3734000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Família]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4056000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Canção Nova Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4056000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5833000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal Saúde]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4085000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVE Cultura]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4095000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Pai Eterno]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4105000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[O Caminho Antigo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4105000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Rondônia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4110000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Século 21]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10974000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11014000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11740000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11820000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 41500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11940000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11960000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 41500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Star-One-C2C4-70.0W b/dvb-s/Star-One-C2C4-70.0W
deleted file mode 100644
index 675947d0..00000000
--- a/dvb-s/Star-One-C2C4-70.0W
+++ /dev/null
@@ -1,774 +0,0 @@
-# Channel table for Star One C2/C4 at 70.0°W
-# Source: http://www.lyngsat.com/Star-One-C2-C4.html
-
-[TV Assembleia Legislativa do Estado de Mato Grosso]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3645000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Super]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3648000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal do Criador]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3652000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Brasil Central]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3656000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal Rural]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3660000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Evangelizar]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3664000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2980000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Milagro]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3665000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2544000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Vida]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3685000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Boas Novas Belém]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3693000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Polishop]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3696000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede TV!]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3700000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Novo Tempo Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3711000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3715000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Verdes Mares Cariri]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3734000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Horizonte]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3744000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBT Nacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3744000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5700000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Brasil 2]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3747000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBT Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3753000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7390000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3756000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Terra Viva]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3762000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Band Nacional]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3768000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Shoptime]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3777000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RPC TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3808000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Morena Campo Grande]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3816000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Centro América Cuiabá]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3825000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Bahia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3834000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3875000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Anhanguera Goiânia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3887000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[RBS TV Porto Alegre]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3905000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Globo São Paulo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3914000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mundo Maior]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3922000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2727000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Justiça]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3925000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3328000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EPTV Sul de Minas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3925000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Câmara]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3931000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3542000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[EPTV Campinas e região]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3933000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Senado]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3935000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3214000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3948000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 17500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Diário]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3950000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2916000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Ceará]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3955000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBN International]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3959000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1875000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Mirante]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3965000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Escola]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3965000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4069000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Assembléia Ceará]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1852000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Verdes Mares]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3973000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede CNT Satélite]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3974000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4166000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Uninter]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3978000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3617000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Aparecida]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3982000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4573000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Paraná Turismo]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3985000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Grupo Bandeirantes]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3990000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7400000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[SBA]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3993000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 12416000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gazeta]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3996000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2520000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Minas]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4033000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8280000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Liberal]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4045000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NSC TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4047000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Record News]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4052000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3734000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Família]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4056000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Canção Nova Rede]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4056000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5833000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Canal Saúde]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4085000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TVE Cultura]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4095000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Pai Eterno]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4105000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[O Caminho Antigo]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4105000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Rondônia]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4110000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rede Século 21]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4111000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10974000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CANTV TV Satelital]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10982000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11014000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[CANTV TV Satelital]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11050000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11090000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11130000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11134000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11170000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Americas Norte]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11174000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27900000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11740000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11780000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11820000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 41500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11940000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11960000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29900000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 41500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12120000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 29890000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Claro Brasil]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12160000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28890000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/T10T12-&-SES-3-103.0W b/dvb-s/T10T12-&-SES-3-103.0W
deleted file mode 100644
index 070406f3..00000000
--- a/dvb-s/T10T12-&-SES-3-103.0W
+++ /dev/null
@@ -1,763 +0,0 @@
-# Channel table for T10/T12 & SES 3 at 103.0°W
-# Source: http://www.lyngsat.com/T10-T12-and-SES-3.html
-
-[QVC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3720000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Univisión]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[MSG]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3780000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Gulfcom]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3820000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 28000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ION Media Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3840000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[In Demand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3860000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3900000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[America's Auction Channel]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3918000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3506000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3924000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2734000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[GMA Network]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3926000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[America's Auction Channel]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3928000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3150000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3945000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 25000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[In Demand]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[QVC 2]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3972000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 14800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ovation]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 3990000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Montana Public Affairs Network]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 3997000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1900000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[HSN]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 4000000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29270000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Televisa Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[ION Media Networks]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[QVC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Univisión]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4100000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4140000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Showtime HD Plex 3]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4160000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Showtime HD West Plex 2]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 4180000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11728000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11734000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11760000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11815000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4500000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11904000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11910000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11917000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11923000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11929000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11935000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11950000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11956000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11962000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11969000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11985000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11990000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11995000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3540000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11996000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12002000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12005000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12009000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12010000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12015000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12020000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12025000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12025000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12030000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12035000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4250000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12053000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3540000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12057000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3540000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12067000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3540000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12075000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3540000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DW English]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12080000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 29970000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[NBC]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12120000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12145000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 20000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12151000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12157000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12163000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12175000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4600000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[FedEx]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12182000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 25000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18327000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18327000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18367000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18367000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18407000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18407000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18447000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18447000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18487000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18487000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18527000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18527000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18567000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18567000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18607000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18607000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[DirecTV USA]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18648000
-	POLARIZATION = RIGHT
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
diff --git a/dvb-s/Trksat-3A4A-42.0E b/dvb-s/Trksat-3A4A-42.0E
deleted file mode 100644
index 1cf55c75..00000000
--- a/dvb-s/Trksat-3A4A-42.0E
+++ /dev/null
@@ -1,1357 +0,0 @@
-# Channel table for Türksat 3A/4A at 42.0°E
-# Source: http://www.lyngsat.com/Turksat-3A-4A.html
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10955000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6250000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10960000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10965000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10968000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 7920000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10970000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10975000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT 4K]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10980000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 12500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10981000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 10984000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 10997000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2660000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11002000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11006000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11012000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11017000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5920000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11024000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11027000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11031000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11040000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ciner]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11045000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ciner]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11053000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11054000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11062000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4820000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11067000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11071000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11096000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11096000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11127000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2455000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Karnaval]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11127000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1666000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11131000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2455000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11133000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11135000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11144000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11148000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11155000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11156000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11161000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3180000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Digiturk]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11180000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[7 Sky]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11196000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 1851000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11458000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11460000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11462000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11466000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11470000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11475000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11478000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11486000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11487000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6800000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11496000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11504000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11514000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11518000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11521000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tarim TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11527000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11545000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4425000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11549000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11558000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11562000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11566000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11570000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2795000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11573000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11574000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11577000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11580000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2962000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11585000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11591000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11598000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11606000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11608000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3702000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11622000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11623000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11626000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11627000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2962000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11630000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2200000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11634000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2300000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11637000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11639000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11646000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11647000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11651000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11651000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11655000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 3500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11656000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11667000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2960000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11675000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Digiturk]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11676000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 24444000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11683000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11686000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2962000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11691000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11691000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tivibu]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11789000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tivibu]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11853000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 25000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11855000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Tivibu]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11880000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turkuvaz]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11883000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11916000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11958000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[D-Smart]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11977000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turkuvaz]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 11999000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 11666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türkmeneli TV]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12009000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Dogus Yayin Grubu]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12015000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[D-Smart]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12034000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Turkuvaz]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12054000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Digiturk]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12073000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12083000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 13750000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kanal 7]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12095000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 4800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Kanal 7]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12103000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 8333000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[D-Smart]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12188000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Ciner]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12209000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 10000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TV Net]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12213000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5833000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Show TV]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12219000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TGRT]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12228000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 8400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[D-Smart]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12245000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Güç Telekom Medya ve Iletisim Ticaret]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12265000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TürkMedya]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12298000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4800000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[TürkMedya]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12310000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Türkiye]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12329000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Türkiye]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12336000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 5520000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12344000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Acunmedya]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12346000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9600000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Acunmedya]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12356000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 7100000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12379000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12380000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12422000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12422000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12442000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Rah-e-Farda]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12446000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2400000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Fox Networks Group Turkey]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12457000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 15000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12458000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12506000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2660000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12517000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12542000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3703000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12559000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12559000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12565000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3333000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12570000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12573000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12576000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2480000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12578000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2070000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12578000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12588000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3200000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12588000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12595000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2955000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12599000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12608000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12610000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 20830000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12617000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12624000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2170000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12626000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2222000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12633000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12639000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12649000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 2962000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12655000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 5925000
-	MODULATION = QPSK
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12685000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12685000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12713000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 2200000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 12729000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 30000000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[Türksat]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 18669000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 22500000
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-[various]
-	DELIVERY_SYSTEM = DVBS2
-	FREQUENCY = 18774000
-	POLARIZATION = LEFT
-	SYMBOL_RATE = 22500000
-	MODULATION = PSK/8
-	INNER_FEC = AUTO
-	INVERSION = AUTO
-
-- 
cgit v1.2.3