diff --git a/waivers/nonssl_endpoints/nonssl_xfail.txt b/waivers/nonssl_endpoints/nonssl_xfail.txt
index 7aa9f4c..98f7cdb 100644
--- a/waivers/nonssl_endpoints/nonssl_xfail.txt
+++ b/waivers/nonssl_endpoints/nonssl_xfail.txt
@@ -1,17 +1 @@
 # Expected failure list for non-SSL endpoints
-
-
-# frankfurt History
-# robot 30209
-# message-router 30227
-# sniro-emulator 30288
-# aaf-fs 31115
-## Frankfurt SECCOM waiver:
-# log-kibana 30253
-# log-es 30254
-# log-ls 30255
-## Waiver for Frankfurt due to AAF impact
-# so 30277
-## Upstream:
-# awx-web 30478
-# netbox-nginx 30420
diff --git a/waivers/root_pods/root_pods_xfail.txt b/waivers/root_pods/root_pods_xfail.txt
index dfbdeae..53af2e3 100644
--- a/waivers/root_pods/root_pods_xfail.txt
+++ b/waivers/root_pods/root_pods_xfail.txt
@@ -10,37 +10,3 @@
 cassandra
 awx
 netbox
-
-# frankfurt history
-## We consider only the pods we built
-#aaf-cass # cassandra
-#aaf-sms-vault # upstream vault and consul docker used by aaf AAF-1102
-#aai # aai pods not launched as root even root user still in dockers AAI-2822
-#awx # ansible
-#cassandra # common cassandra
-#consul # nobody remembers who is responsible for consul
-#dcae-redis # redis container
-#dcae-mongo # mongo container
-#dcae-cloudify-manager # DCAEGEN2-2121
-#dcae-tca-analytics # tmp tca will be replaced by secured tca2 in G
-#mariadb # common mariadb
-#msb-consul # another consul
-#multicloud-fcaps # rabbit-mq upstream pod MULTICLOUD-1017
-#multicloud-k8s-etcd
-#multicloud-k8s-mongo
-#music-cassandra # music has itw own cassandra
-#nbi-mongo # a mongo db
-#netbox # netbox
-#pomba-elasticsearch # elasticsearch
-#portal-cassandra # portal cassandra
-#portal-db # portal mariadb
-#portal-zookeeper # portal zookeeper
-#zookeeper # common zookeper
-
-## other waivers
-#robot # testing
-#sniro-emulator # testing
-#oof-cmso-service # testing
-#vnfsdk # testing VNFSDK-565
-#pomba # nobody taking cares of pomba for several releases
-#dcaemod # dcae experimental pods for Frankfurt