diff --git a/data/aut-num/AS4242421476 b/data/aut-num/AS4242421476
deleted file mode 100644
index 2ca628a00..000000000
--- a/data/aut-num/AS4242421476
+++ /dev/null
@@ -1,7 +0,0 @@
-aut-num:            AS4242421476
-as-name:            4c3-AS
-descr:              Marcel personal AS
-admin-c:            M4RC3L-DN42
-tech-c:             M4RC3L-DN42
-mnt-by:             M4RC3L-MNT
-source:             DN42
diff --git a/data/dns/4c3.dn42 b/data/dns/4c3.dn42
deleted file mode 100644
index e08619ccf..000000000
--- a/data/dns/4c3.dn42
+++ /dev/null
@@ -1,7 +0,0 @@
-domain:             4c3.dn42
-admin-c:            M4RC3L-DN42
-tech-c:             M4RC3L-DN42
-mnt-by:             M4RC3L-MNT
-nserver:            ns.4c3.dn42 fd42:7d2b:8792::53
-nserver:            ns.4c3.dn42 172.23.126.163
-source:             DN42
diff --git a/data/dns/m4rc3l.dn42 b/data/dns/m4rc3l.dn42
deleted file mode 100644
index 10a2511d9..000000000
--- a/data/dns/m4rc3l.dn42
+++ /dev/null
@@ -1,6 +0,0 @@
-domain:             m4rc3l.dn42
-admin-c:            M4RC3L-DN42
-tech-c:             M4RC3L-DN42
-mnt-by:             M4RC3L-MNT
-nserver:            ns.4c3.dn42
-source:             DN42
diff --git a/data/dns/schrottlaube.dn42 b/data/dns/schrottlaube.dn42
index 97a0119b8..4c45e485c 100644
--- a/data/dns/schrottlaube.dn42
+++ b/data/dns/schrottlaube.dn42
@@ -4,5 +4,6 @@ admin-c:            N00B0SS-DN42
 tech-c:             M4RC3L-DN42
 tech-c:             N00B0SS-DN42
 mnt-by:             SCHROTT-MNT
-nserver:            ns.4c3.dn42
+nserver:            ns.schrottlaube.dn42 fd42:c4db:68ae::
+nserver:            ns.schrottlaube.dn42 172.23.125.72
 source:             DN42
diff --git a/data/inet6num/fd42:7d2b:8792::_48 b/data/inet6num/fd42:7d2b:8792::_48
deleted file mode 100644
index ac4c6f499..000000000
--- a/data/inet6num/fd42:7d2b:8792::_48
+++ /dev/null
@@ -1,11 +0,0 @@
-inet6num:           fd42:7d2b:8792:0000:0000:0000:0000:0000 - fd42:7d2b:8792:ffff:ffff:ffff:ffff:ffff
-cidr:               fd42:7d2b:8792::/48
-netname:            M4RC3L-NETWORK
-descr:              Network of Marcel
-country:            DE
-admin-c:            M4RC3L-DN42
-tech-c:             M4RC3L-DN42
-mnt-by:             M4RC3L-MNT
-status:             ASSIGNED
-nserver:            ns.4c3.dn42
-source:             DN42
diff --git a/data/inet6num/fd42:c4db:68ae::_48 b/data/inet6num/fd42:c4db:68ae::_48
index 1c2b63222..4b399af83 100644
--- a/data/inet6num/fd42:c4db:68ae::_48
+++ b/data/inet6num/fd42:c4db:68ae::_48
@@ -9,5 +9,5 @@ tech-c:             M4RC3L-DN42
 tech-c:             N00B0SS-DN42
 mnt-by:             SCHROTT-MNT
 status:             ASSIGNED
-nserver:            ns.4c3.dn42
+nserver:            ns.schrottlaube.dn42
 source:             DN42
diff --git a/data/inetnum/172.23.125.72_29 b/data/inetnum/172.23.125.72_29
index 3a7c7b17f..58462ee8c 100644
--- a/data/inetnum/172.23.125.72_29
+++ b/data/inetnum/172.23.125.72_29
@@ -9,5 +9,5 @@ tech-c:             M4RC3L-DN42
 tech-c:             N00B0SS-DN42
 mnt-by:             SCHROTT-MNT
 status:             ASSIGNED
-nserver:            ns.4c3.dn42
+nserver:            ns.schrottlaube.dn42
 source:             DN42
diff --git a/data/inetnum/172.23.126.160_27 b/data/inetnum/172.23.126.160_27
deleted file mode 100644
index adf12f0d0..000000000
--- a/data/inetnum/172.23.126.160_27
+++ /dev/null
@@ -1,11 +0,0 @@
-inetnum:            172.23.126.160 - 172.23.126.191
-cidr:               172.23.126.160/27
-netname:            4c3-NETWORK
-descr:              Network of Marcel
-country:            DE
-admin-c:            M4RC3L-DN42
-tech-c:             M4RC3L-DN42
-mnt-by:             M4RC3L-MNT
-status:             ASSIGNED
-nserver:            ns.4c3.dn42
-source:             DN42
diff --git a/data/route/172.23.126.160_27 b/data/route/172.23.126.160_27
deleted file mode 100644
index a174071cb..000000000
--- a/data/route/172.23.126.160_27
+++ /dev/null
@@ -1,5 +0,0 @@
-route:              172.23.126.160/27
-origin:             AS4242421476
-max-length:         27
-mnt-by:             M4RC3L-MNT
-source:             DN42
diff --git a/data/route6/fd42:7d2b:8792::_48 b/data/route6/fd42:7d2b:8792::_48
deleted file mode 100644
index e412fc0f8..000000000
--- a/data/route6/fd42:7d2b:8792::_48
+++ /dev/null
@@ -1,5 +0,0 @@
-route6:             fd42:7d2b:8792::/48
-origin:             AS4242421476
-max-length:         48
-mnt-by:             M4RC3L-MNT
-source:             DN42