diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 0d6bdae..7d86d54 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -315,7 +315,7 @@ cpe:
     model: TL-WR841N
     version: release
     location: Turm D, 5. Etage
-    lan-access: priv7
+    lan-access: pub
     radios:
       'platform/qca953x_wmac':
         channel: 1
@@ -323,21 +323,6 @@ cpe:
         ssids:
           'ZW public':
             net: pub
-          'Zippi':
-            net: priv7
-            psk: |
-              -----BEGIN PGP MESSAGE-----
-              
-              hQEMA2PKcvDMvlKLAQgAjnmaVwPChe6mDZI1yBKyBhsbuGabre05JWYYIReV4rnG
-              SJEp6Ei7kbm+2iEhrlXyhu9Ke2gILUFXbopRoaytOjvT9VcnBhWLPA4EuqsGLep5
-              t32XyK94BLTY3vRhZrvcloZAjXlaGnaEyAQ9Wk5IVoQu1S+TeVd2VOS67BQeeCLr
-              xFE7mzY8FQR01jBC0QEOXRdfwZ83Zm4JzwTm4ba6CABElmQoBbAPP86ydbNxl1n7
-              R/n6y/A6GjgR8HRLaISO0x6Vy6XCWBEhMPbGC8/7qF+1BdVo9qe9IyQBZAyfBQ2b
-              nTDna1wB4y7CSOEnVC5WRgmjrHr4+JB3/gPPqR6gddJGAYkw7BkNct7Xd8bWaOJP
-              LSzwuOSwP9ozjMD8RxfJ9ctfGTI4aJ8EcMJ6CAdbnMl0qrucTvlh/nZ/xNtzXplA
-              is+jAuMF8Q==
-              =MtC9
-              -----END PGP MESSAGE-----
   ap8:
     password: |
       -----BEGIN PGP MESSAGE-----
@@ -749,46 +734,6 @@ cpe:
           'ZW public':
             net: pub
 
-  ap20:
-    password: |
-      -----BEGIN PGP MESSAGE-----
-      
-      hQEMA2PKcvDMvlKLAQf/couJwoTRzTEycGB3t2aa4NTjOxKmh/Q7ScvHbxEX1VhX
-      sg0bW+CXQag+zy00oAbXlK/vOSP+NvOlt7vn8X50kmYTHlcZtelry4tAZeBJyw29
-      Vb/VvrR6F8nft1q2hpiGzAWgy8rkyncAKwCdLfsdOC/A4/QH5jis9fMnkDLbwUb+
-      cruIIe977BlE1jC5s09F7ZSeHUby2lMhcsxuyS+DTsBIc37Qp/Tpeq/sY7wtbrE2
-      MbP4mZjtBOgUCCtvauONtKjt2Zg92scob8lHm4m77qh6b4rxJ3lEW+oapelHQGId
-      ULxd5KM48AqV3AVexmTXNVlU0ppIdPvjxV4WR5VQt9JJAevANNiEBSPbsQwF0QNO
-      4M1Fl6WH1WTjVf0WQPMmUowiH0hyJuSx46sju9bEJJCaueJtIhCvUbOeOURwZaVe
-      ZLBzZVhVZJoO9Q==
-      =bGE5
-      -----END PGP MESSAGE-----
-    model: TL-WA901NDv3
-    version: release
-    location: Dekomissioniert (B 4.04.01)
-    lan-access: priv7
-    radios:
-      'platform/ar934x_wmac':
-        channel: 1
-        htmode: HT40+
-        ssids:
-          'ZW public':
-            net: pub
-          'Zippi':
-            net: priv7
-            psk: |
-              -----BEGIN PGP MESSAGE-----
-              
-              hQEMA2PKcvDMvlKLAQgAjnmaVwPChe6mDZI1yBKyBhsbuGabre05JWYYIReV4rnG
-              SJEp6Ei7kbm+2iEhrlXyhu9Ke2gILUFXbopRoaytOjvT9VcnBhWLPA4EuqsGLep5
-              t32XyK94BLTY3vRhZrvcloZAjXlaGnaEyAQ9Wk5IVoQu1S+TeVd2VOS67BQeeCLr
-              xFE7mzY8FQR01jBC0QEOXRdfwZ83Zm4JzwTm4ba6CABElmQoBbAPP86ydbNxl1n7
-              R/n6y/A6GjgR8HRLaISO0x6Vy6XCWBEhMPbGC8/7qF+1BdVo9qe9IyQBZAyfBQ2b
-              nTDna1wB4y7CSOEnVC5WRgmjrHr4+JB3/gPPqR6gddJGAYkw7BkNct7Xd8bWaOJP
-              LSzwuOSwP9ozjMD8RxfJ9ctfGTI4aJ8EcMJ6CAdbnMl0qrucTvlh/nZ/xNtzXplA
-              is+jAuMF8Q==
-              =MtC9
-              -----END PGP MESSAGE-----
 
   ap21:
     password: |
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 0630e69..ec81f79 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -137,7 +137,6 @@ switches:
         vlans:
           - mgmt
           - pub
-          - priv7
           - priv15
           - priv16
           - priv21
@@ -600,7 +599,6 @@ switches:
         vlans:
           - mgmt
           - pub
-          - priv7
           - priv15
           - priv16
           - priv21
@@ -626,7 +624,6 @@ switches:
         vlans:
           - mgmt
           - pub
-          - priv7
       ap22:
         mode: trunk
         ports: 2