diff --git a/site.conf b/site.conf
index 1336ea367516bd31325496d154958f27d8403e9b..f265998c864aa3283a17ecf7f80cc1c17262555a 100644
--- a/site.conf
+++ b/site.conf
@@ -63,140 +63,60 @@
                         key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
                         remotes = {
                             '"gw01.freifunk-stuttgart.de" port 10037',
-                            '"gw01s01.freifunk-stuttgart.de" port 10041',
-                            '"gw01s02.freifunk-stuttgart.de" port 10042',
-                            '"gw01s03.freifunk-stuttgart.de" port 10043',
-                            '"gw01s04.freifunk-stuttgart.de" port 10044',
-                            '"gw01s05.freifunk-stuttgart.de" port 10045',
-                            '"gw01s06.freifunk-stuttgart.de" port 10046',
-                            '"gw01s07.freifunk-stuttgart.de" port 10047',
-                            '"gw01s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw02 = {
                         key = '31eaff2ce1c19d0c9af693c4500defc4e1b4979ad75133d779532f0572955875',
                         remotes = {
                             '"gw02.freifunk-stuttgart.de" port 10037',
-                            '"gw02s01.freifunk-stuttgart.de" port 10041',
-                            '"gw02s02.freifunk-stuttgart.de" port 10042',
-                            '"gw02s03.freifunk-stuttgart.de" port 10043',
-                            '"gw02s04.freifunk-stuttgart.de" port 10044',
-                            '"gw02s05.freifunk-stuttgart.de" port 10045',
-                            '"gw02s06.freifunk-stuttgart.de" port 10046',
-                            '"gw02s07.freifunk-stuttgart.de" port 10047',
-                            '"gw02s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw03 = {
                         key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
                         remotes = {
                             '"gw03.freifunk-stuttgart.de" port 10037',
-                            '"gw03s01.freifunk-stuttgart.de" port 10041',
-                            '"gw03s02.freifunk-stuttgart.de" port 10042',
-                            '"gw03s03.freifunk-stuttgart.de" port 10043',
-                            '"gw03s04.freifunk-stuttgart.de" port 10044',
-                            '"gw03s05.freifunk-stuttgart.de" port 10045',
-                            '"gw03s06.freifunk-stuttgart.de" port 10046',
-                            '"gw03s07.freifunk-stuttgart.de" port 10047',
-                            '"gw03s08.freifunk-stuttgart.de" port 10048'
-                        },
+			},
                     },
                     gw04 = {
                         key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
                         remotes = {
                             '"gw04.freifunk-stuttgart.de" port 10037',
-                            '"gw04s01.freifunk-stuttgart.de" port 10041',
-                            '"gw04s02.freifunk-stuttgart.de" port 10042',
-                            '"gw04s03.freifunk-stuttgart.de" port 10043',
-                            '"gw04s04.freifunk-stuttgart.de" port 10044',
-                            '"gw04s05.freifunk-stuttgart.de" port 10045',
-                            '"gw04s06.freifunk-stuttgart.de" port 10046',
-                            '"gw04s07.freifunk-stuttgart.de" port 10047',
-                            '"gw04s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw05 = {
                         key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
                         remotes = {
                             '"gw05.freifunk-stuttgart.de" port 10037',
-                            '"gw05s01.freifunk-stuttgart.de" port 10041',
-                            '"gw05s02.freifunk-stuttgart.de" port 10042',
-                            '"gw05s03.freifunk-stuttgart.de" port 10043',
-                            '"gw05s04.freifunk-stuttgart.de" port 10044',
-                            '"gw05s05.freifunk-stuttgart.de" port 10045',
-                            '"gw05s06.freifunk-stuttgart.de" port 10046',
-                            '"gw05s07.freifunk-stuttgart.de" port 10047',
-                            '"gw05s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw06 = {
                         key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
                         remotes = {
                             '"gw06.freifunk-stuttgart.de" port 10037',
-                            '"gw06s01.freifunk-stuttgart.de" port 10041',
-                            '"gw06s02.freifunk-stuttgart.de" port 10042',
-                            '"gw06s03.freifunk-stuttgart.de" port 10043',
-                            '"gw06s04.freifunk-stuttgart.de" port 10044',
-                            '"gw06s05.freifunk-stuttgart.de" port 10045',
-                            '"gw06s06.freifunk-stuttgart.de" port 10046',
-                            '"gw06s07.freifunk-stuttgart.de" port 10047',
-                            '"gw06s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw07 = {
                         key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
                         remotes = {
                             '"gw07.freifunk-stuttgart.de" port 10037',
-                            '"gw07s01.freifunk-stuttgart.de" port 10041',
-                            '"gw07s02.freifunk-stuttgart.de" port 10042',
-                            '"gw07s03.freifunk-stuttgart.de" port 10043',
-                            '"gw07s04.freifunk-stuttgart.de" port 10044',
-                            '"gw07s05.freifunk-stuttgart.de" port 10045',
-                            '"gw07s06.freifunk-stuttgart.de" port 10046',
-                            '"gw07s07.freifunk-stuttgart.de" port 10047',
-                            '"gw07s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw08 = {
                         key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
                         remotes = {
                             '"gw08.freifunk-stuttgart.de" port 10037',
-                            '"gw08s01.freifunk-stuttgart.de" port 10041',
-                            '"gw08s02.freifunk-stuttgart.de" port 10042',
-                            '"gw08s03.freifunk-stuttgart.de" port 10043',
-                            '"gw08s04.freifunk-stuttgart.de" port 10044',
-                            '"gw08s05.freifunk-stuttgart.de" port 10045',
-                            '"gw08s06.freifunk-stuttgart.de" port 10046',
-                            '"gw08s07.freifunk-stuttgart.de" port 10047',
-                            '"gw08s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw09 = {
                         key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
                         remotes = {
                             '"gw09.freifunk-stuttgart.de" port 10037',
-                            '"gw09s01.freifunk-stuttgart.de" port 10041',
-                            '"gw09s02.freifunk-stuttgart.de" port 10042',
-                            '"gw09s03.freifunk-stuttgart.de" port 10043',
-                            '"gw09s04.freifunk-stuttgart.de" port 10044',
-                            '"gw09s05.freifunk-stuttgart.de" port 10045',
-                            '"gw09s06.freifunk-stuttgart.de" port 10046',
-                            '"gw09s07.freifunk-stuttgart.de" port 10047',
-                            '"gw09s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                     gw10 = {
                         key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
                         remotes = {
                             '"gw10.freifunk-stuttgart.de" port 10037',
-                            '"gw10s01.freifunk-stuttgart.de" port 10041',
-                            '"gw10s02.freifunk-stuttgart.de" port 10042',
-                            '"gw10s03.freifunk-stuttgart.de" port 10043',
-                            '"gw10s04.freifunk-stuttgart.de" port 10044',
-                            '"gw10s05.freifunk-stuttgart.de" port 10045',
-                            '"gw10s06.freifunk-stuttgart.de" port 10046',
-                            '"gw10s07.freifunk-stuttgart.de" port 10047',
-                            '"gw10s08.freifunk-stuttgart.de" port 10048'
                         },
                     },
                 },