diff --git a/data/aut-num/AS4242423827 b/data/aut-num/AS4242423827
deleted file mode 100644
index 299d5ee1f..000000000
--- a/data/aut-num/AS4242423827
+++ /dev/null
@@ -1,13 +0,0 @@
-aut-num:            AS4242423827
-as-name:            NULLROUTE-AS
-descr:              nullroute.eu.org (Broken Symlink) dn42 AS
-admin-c:            GRAWITY-DN42
-tech-c:             GRAWITY-DN42
-mnt-by:             NULLROUTE-MNT
-remarks:            ; hexa
-mp-import:          afi any from AS4242420101 accept ANY
-mp-export:          afi any to AS4242420101 announce AS206633
-remarks:            ; weiti
-mp-import:          afi any from AS4242423905 accept ANY
-mp-export:          afi any to AS4242423905 announce AS206633
-source:             DN42
diff --git a/data/dns/nullroute.dn42 b/data/dns/nullroute.dn42
deleted file mode 100644
index 5ade5b228..000000000
--- a/data/dns/nullroute.dn42
+++ /dev/null
@@ -1,8 +0,0 @@
-domain:             nullroute.dn42
-admin-c:            GRAWITY-DN42
-tech-c:             GRAWITY-DN42
-nserver:            sky.nullroute.eu.org
-nserver:            wolke.nullroute.eu.org
-mnt-by:             NULLROUTE-MNT
-status:             CONNECT
-source:             DN42
diff --git a/data/inetnum/172.20.158.0_24 b/data/inetnum/172.20.158.0_24
deleted file mode 100644
index c408c8be8..000000000
--- a/data/inetnum/172.20.158.0_24
+++ /dev/null
@@ -1,12 +0,0 @@
-inetnum:            172.20.158.0 - 172.20.158.255
-netname:            NULLROUTE-DN42
-nserver:            sky.nullroute.eu.org
-nserver:            wolke.nullroute.eu.org
-admin-c:            GRAWITY-DN42
-tech-c:             GRAWITY-DN42
-mnt-by:             NULLROUTE-MNT
-nserver:            sky.nullroute.eu.org
-nserver:            wolke.nullroute.eu.org
-status:             ASSIGNED PA
-cidr:               172.20.158.0/24
-source:             DN42
diff --git a/data/inetnum/172.20.158.0_27 b/data/inetnum/172.20.158.0_27
new file mode 100644
index 000000000..9fac8b1ab
--- /dev/null
+++ b/data/inetnum/172.20.158.0_27
@@ -0,0 +1,8 @@
+inetnum:            172.20.158.0 - 172.20.158.31
+netname:            NULLROUTE-DN42
+admin-c:            GRAWITY-DN42
+tech-c:             GRAWITY-DN42
+mnt-by:             NULLROUTE-MNT
+status:             ASSIGNED PA
+cidr:               172.20.158.0/27
+source:             DN42
diff --git a/data/mntner/NULLROUTE-MNT b/data/mntner/NULLROUTE-MNT
index 2d567fb67..3741ded5a 100644
--- a/data/mntner/NULLROUTE-MNT
+++ b/data/mntner/NULLROUTE-MNT
@@ -1,6 +1,5 @@
 mntner:             NULLROUTE-MNT
 descr:              nullroute.eu.org
-sha512-pw:          ZGQxOGJhNTYyN2YzMzhiODBmMzc5OWNkYTg5N2QxZWJhMWI3NjEwNjkwMDY5ZmYzYjQyNWU2ZWU4NGU0OGEzZjAzNDU4ZTAzNTE1NWFiZjI2N2ZmM2UyYzkyZTBmZTgwZTk0NDIwMDFlYjBhMjdmY2Q0NGU2OTYxMTk5YjMyNTVhNjMxMGE3ZWIxODM5MzJlYmQ1NTM3MjhkZTljMWE0Yjk2ZGZiOWI2MDM1MjZiY2Q1MjE2N2NlMTYzYzg3ZDhmNjUwYjk3NTM0ZmM0ODFkYTBkYTI0NmViZTAzZmUxYzQzZTU0N2YyMmNmNTFjZTRhZWFkZjcyOWFkNWEwY2FkNjE2ZjA2MjZlOTE3YWM5NzM2N2MwZGU5OTU0ZjNiMGJiNjc0MTQxY2JmYmZiMjBiYWRhYTA0ZTQyYjc4ZmIyODZhYzA5ZDQ1ZDFhM2VkYjljZjVmNTQ2NTVkYWQ4MGQ0MmFlZWFhYmY1ODRhMzg0YWU0YzU1ZTQzODllYmI3ZmQ5OGQyNjU3MGRlMDQzYmMxODhhZGVlN2ZhYmQyN2E3MzJkNjJjNTUwM2MzYTk4MjM0ZjYwMzc4OTUyNzA1YTRhZWYwODNlYWI5Zjg0YjE1ZGQ1ZmNmYWQzMTU4OWY0MmEyM2M3MTFmNDdiMDIxNjdiM2QwZGJkYjE3ZGY4NGVhZmE=
 auth:               pgp-fingerprint 2357E10CEF4F7ED27E233AD5D24F6CB2C1B52632
 auth:               ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOue75DR7SkTsNIWsvQpXG5cIqmZ666Vs8Nc+bqe+Rwv grawity@nullroute.eu.org (2015-05-15)
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCe2VVMk6bxZaSBvl9vGff+cfHEguXMPVYm308/v3aUEm2TNN/pWI64RewPjCbOzP0P/DDeBzfQzT8LioXyX/UZfbfX/KEkdIh5n4smLckzEVE6L/54zfI5ec0yAAceRVehBZB6p+Imh173fN1EGAMc6MvxqgoKVHLM3llctJ+DWDCena86UeASOQFtk9t11EB1Co1iveGSOJmICSm1zadSUy2qViGQvETLnyQLJoGI1fCrUW+INcklRxg1mF0K1yaclzh1j8WYhk82Jgkh1A431gVpol5f1elmI0d8Xg3bx5TDsQAnSQC4+e2G9rxPX0TDoDggnPaUG7SqgRvdUO1Iqhd6Dc1I9cyBQNLI7o/XzXsn7KtQXxCBaKu96DIP0tnkBRblUKqLy63F1hnuE6IvsQIJmRkZumRWPTbJzGKL2U04QBB1V/WhNISLNvd6IW5hsJxRWJSu4ASXdErefaZYCtFL12kHSF5VI5RqrWTuEhroT9cPt6uF3T39lFJMj23mecI5SW7Eo8BI2x+l5x1ZjEayKIixWYKyqiEQqfKMsrvcZJUf4/xk7KSPrsdGQ/NY3Vuu86nM+9lC3mj2JeZ0l+qWZuVRHtm3TYH/fqsK0hxNOsOsJu4epKRwu5QSq1A4HRiH5lv37AOF9R7564tsT2SaXfV8iwWNvhO17Zdd/w== grawity@nullroute.eu.org (2011-11-01)
diff --git a/data/person/GRAWITY-DN42 b/data/person/GRAWITY-DN42
index 806c63ddf..4d46ff107 100644
--- a/data/person/GRAWITY-DN42
+++ b/data/person/GRAWITY-DN42
@@ -1,9 +1,8 @@
 person:             grawity
 nic-hdl:            GRAWITY-DN42
 contact:            irc://hackint/~grawity
-contact:            irc://irc.freenode.net/~grawity
+contact:            irc://freenode/~grawity
 e-mail:             grawity@gmail.com
-e-mail:             grawity@nullroute.eu.org
 pgp-fingerprint:    2357E10CEF4F7ED27E233AD5D24F6CB2C1B52632
 mnt-by:             NULLROUTE-MNT
 source:             DN42
diff --git a/data/route/172.20.158.0_24 b/data/route/172.20.158.0_27
similarity index 56%
rename from data/route/172.20.158.0_24
rename to data/route/172.20.158.0_27
index ea0c64dc4..1874029d0 100644
--- a/data/route/172.20.158.0_24
+++ b/data/route/172.20.158.0_27
@@ -1,5 +1,4 @@
-route:              172.20.158.0/24
+route:              172.20.158.0/27
 origin:             AS206633
-origin:             AS4242423827
 mnt-by:             NULLROUTE-MNT
 source:             DN42
diff --git a/data/route6/fd42:2606:32f4::_48 b/data/route6/fd42:2606:32f4::_48
index 39fba4cee..0724c1c76 100644
--- a/data/route6/fd42:2606:32f4::_48
+++ b/data/route6/fd42:2606:32f4::_48
@@ -1,5 +1,4 @@
 route6:             fd42:2606:32f4::/48
 origin:             AS206633
-origin:             AS4242423827
 mnt-by:             NULLROUTE-MNT
 source:             DN42