diff --git a/data/aut-num/AS64738 b/data/aut-num/AS64738
index d4405f95f..83c78c5bc 100644
--- a/data/aut-num/AS64738
+++ b/data/aut-num/AS64738
@@ -1,42 +1,6 @@
 aut-num:            AS64738
 as-name:            WELTERDE-AS
 descr:              welterde's AS
-remarks:            ------[ peers ]-------------------------------------------------------
-remarks:            more route information goes here
-remarks:            ------< IPv6 communities >--------------------------------------------
-remarks:            (0  ) => (0,<peeras>)           Do not advertise to <peeras>
-remarks:            (1  ) => (64738,3001)           Prepend 64738 1 time
-remarks:            (2  ) => (64738,3002)           Prepend 64738 2 times
-remarks:            (3  ) => (64738,3003)           Prepend 64738 3 times
-remarks:            (5  ) => (1,<peeras>)           Advertise to <peeras>
-remarks:            (10 ) => (64738,4<location>)    Do not advertise at <location>
-remarks:            => (64738,4001)           Do not advertise at fal1
-remarks:            (15 ) => (3,<peeras>)           Advertise to <peeras>
-remarks:            (20 ) => (64738,5<location>)    Advertise at <location>
-remarks:            (25 ) => (64738,3000)           Advertise to noone
-remarks:            (100) => (64738,5000)           Advertise to everyone
-remarks:            
-remarks:            => (64738,2001)           High latency route
-remarks:            => (64738,2011)           Low bandwidth route - <= 1MBit
-remarks:            => (64738,2012)           Medium bandwidth route - < 10Mbit
-remarks:            => (64738,2013)           High bandwidth route - >= 10Mbit
-remarks:            -----< Locations >----------------------------------------------------
-remarks:            (000) => whole AS               Implemented via seperate rules
-remarks:            (001) => fal1                   Falkenstein1 - hetzner RZ10
-remarks:            (002) => fal2                   Falkenstein2 - hetzner RZ12
-remarks:            (003) => fmt1                   Fremont1 - egihosting via HE
-remarks:            (004) => ulm1                   Ulm1 - @home via acor
-remarks:            (005) => gar1                   Garching1 - @home via m-net
-remarks:            (006) => jen1                   Jena1 - EUServ
-remarks:            (100) => otr                    On the run/road - machines not tied to a location
-remarks:            -----< Routers >------------------------------------------------------
-remarks:            (001) => gandalf.fal1
-remarks:            (002) => hex.fal2
-remarks:            (003) => arda.fmt1
-remarks:            (004) => atomi.ulm1
-remarks:            (005) => cizzco-1760-1.gar1
-remarks:            (006) => dwarfen.jen1
-remarks:            (007) => tux.gar1
 admin-c:            WELTERDE-DN42
 tech-c:             WELTERDE-DN42
 mnt-by:             WELTERDE-MNT
diff --git a/data/aut-num/AS64739 b/data/aut-num/AS64739
index f3fee3684..d1501f2da 100644
--- a/data/aut-num/AS64739
+++ b/data/aut-num/AS64739
@@ -1,8 +1,7 @@
 aut-num:            AS64739
 as-name:            SIGI-AS
 descr:              sigi's AS
-remarks:            route information goes here
 admin-c:            WELTERDE-DN42
 tech-c:             WELTERDE-DN42
-mnt-by:             DUMMY-MNT
+mnt-by:             WELTERDE-MNT
 source:             DN42
diff --git a/data/dns/welterde.dn42 b/data/dns/welterde.dn42
new file mode 100644
index 000000000..bef40905c
--- /dev/null
+++ b/data/dns/welterde.dn42
@@ -0,0 +1,7 @@
+domain:             welterde.dn42
+descr:              welterde.dn42
+admin-c:            WELTERDE-DN42
+tech-c:             WELTERDE-DN42
+mnt-by:             WELTERDE-MNT
+nserver:            ns1.any.welterde.dn42 fdef:5d0d:ee12:0:100:53:42:1
+source:             DN42
diff --git a/data/inet6num/fdef:5d0d:ee12::_48 b/data/inet6num/fdef:5d0d:ee12::_48
index 9df62a46c..a201c0879 100644
--- a/data/inet6num/fdef:5d0d:ee12::_48
+++ b/data/inet6num/fdef:5d0d:ee12::_48
@@ -4,8 +4,7 @@ descr:              welterde's infrastructure ULA net
 admin-c:            WELTERDE-DN42
 tech-c:             WELTERDE-DN42
 status:             ASSIGNED
-nserver:            a.ns.welterde.net
-nserver:            ns1.welterde.dn42
+nserver:            ns1.any.welterde.dn42
 cidr:               fdef:5d0d:ee12::/48
-mnt-by:             DUMMY-MNT
+mnt-by:             WELTERDE-MNT
 source:             DN42
diff --git a/data/inetnum/172.22.253.160_28 b/data/inetnum/172.22.253.160_28
deleted file mode 100644
index dd045e376..000000000
--- a/data/inetnum/172.22.253.160_28
+++ /dev/null
@@ -1,12 +0,0 @@
-inetnum:            172.22.253.160 - 172.22.253.175
-netname:            WELTERDE-TRANSFER-3-IP4NET
-descr:              welterde's transfer network
-admin-c:            WELTERDE-DN42
-tech-c:             WELTERDE-DN42
-status:             ASSIGNED
-nserver:            ns1.welterde.dn42
-nserver:            ns2.welterde.dn42
-nserver:            ns3.welterde.dn42
-cidr:               172.22.253.160/28
-mnt-by:             DUMMY-MNT
-source:             DN42
diff --git a/data/inetnum/172.22.253.192_26 b/data/inetnum/172.22.253.192_26
deleted file mode 100644
index 116df0ddc..000000000
--- a/data/inetnum/172.22.253.192_26
+++ /dev/null
@@ -1,12 +0,0 @@
-inetnum:            172.22.253.192 - 172.22.253.255
-netname:            WELTERDE-TRANSFER-1-IP4NET
-descr:              welterde's transfer network
-admin-c:            WELTERDE-DN42
-tech-c:             WELTERDE-DN42
-status:             ASSIGNED
-nserver:            ns1.welterde.dn42
-nserver:            ns2.welterde.dn42
-nserver:            ns3.welterde.dn42
-cidr:               172.22.253.192/26
-mnt-by:             DUMMY-MNT
-source:             DN42
diff --git a/data/person/WELTERDE-DN42 b/data/person/WELTERDE-DN42
index b84c43c90..100618ffc 100644
--- a/data/person/WELTERDE-DN42
+++ b/data/person/WELTERDE-DN42
@@ -1,6 +1,6 @@
 person:             Tassilo Schweyer
-contact:            mailto:dn42@welterde.de
-contact:            xmpp:welterde@jabber.welterde.de
+e-mail:             dn42@welterde.de
 nic-hdl:            WELTERDE-DN42
-mnt-by:             DUMMY-MNT
+mnt-by:             WELTERDE-MNT
+nick:               welterde
 source:             DN42