diff --git a/data/dns/moohr.dn42 b/data/dns/moohr.dn42
index 7a81a6a3c..0b55c0aa6 100644
--- a/data/dns/moohr.dn42
+++ b/data/dns/moohr.dn42
@@ -2,8 +2,8 @@ domain:             moohr.dn42
 admin-c:            MOOHR-DN42
 tech-c:             MOOHR-DN42
 mnt-by:             MOOHR-MNT
-nserver:            ns1.moohr.dn42 172.23.77.193
-nserver:            ns1.moohr.dn42 fd09:ec7b:bc88::193:1
-nserver:            ns2.moohr.dn42 172.23.77.194
-nserver:            ns2.moohr.dn42 fd09:ec7b:bc88::194:1
+nserver:            ns1.moohr.dn42 172.22.79.193
+nserver:            ns1.moohr.dn42 fd42:4242:2279:193::1
+nserver:            ns2.moohr.dn42 172.22.79.194
+nserver:            ns2.moohr.dn42 fd42:4242:2279:194::1
 source:             DN42
diff --git a/data/inet6num/fd09:ec7b:bc88::_48 b/data/inet6num/fd09:ec7b:bc88::_48
deleted file mode 100644
index 5ce2e6b8b..000000000
--- a/data/inet6num/fd09:ec7b:bc88::_48
+++ /dev/null
@@ -1,12 +0,0 @@
-inet6num:           fd09:ec7b:bc88:0000:0000:0000:0000:0000 - fd09:ec7b:bc88:ffff:ffff:ffff:ffff:ffff
-cidr:               fd09:ec7b:bc88::/48
-netname:            MOOHR-NETWORK
-descr:              MOOHR NETWORK
-nserver:            ns1.moohr.dn42
-nserver:            ns2.moohr.dn42
-country:            HK
-admin-c:            MOOHR-DN42
-tech-c:             MOOHR-DN42
-mnt-by:             MOOHR-MNT
-status:             ASSIGNED
-source:             DN42
diff --git a/data/inet6num/fd42:4242:2279::_48 b/data/inet6num/fd42:4242:2279::_48
index 42f4f53e6..034b29418 100644
--- a/data/inet6num/fd42:4242:2279::_48
+++ b/data/inet6num/fd42:4242:2279::_48
@@ -2,8 +2,9 @@ inet6num:           fd42:4242:2279:0000:0000:0000:0000:0000 - fd42:4242:2279:fff
 cidr:               fd42:4242:2279::/48
 netname:            MOOHR-NETWORK
 descr:              MOOHR NETWORK
-nserver:            ns1.moohr.dn42
-nserver:            ns2.moohr.dn42
+nserver:            ns1.2279.dn42
+nserver:            ns2.2279.dn42
+remarks:            Geofeed https://www.mhr.hk/dn42_geofeed.csv
 country:            HK
 admin-c:            MOOHR-DN42
 tech-c:             MOOHR-DN42
diff --git a/data/inetnum/172.23.77.192_27 b/data/inetnum/172.23.77.192_27
deleted file mode 100644
index 2b6226813..000000000
--- a/data/inetnum/172.23.77.192_27
+++ /dev/null
@@ -1,12 +0,0 @@
-inetnum:            172.23.77.192 - 172.23.77.223
-cidr:               172.23.77.192/27
-netname:            MOOHR-NETWORK
-descr:              MOOHR NETWORK
-nserver:            ns1.moohr.dn42
-nserver:            ns2.moohr.dn42
-country:            HK
-admin-c:            MOOHR-DN42
-tech-c:             MOOHR-DN42
-mnt-by:             MOOHR-MNT
-status:             ASSIGNED
-source:             DN42
diff --git a/data/route/172.23.77.192_27 b/data/route/172.23.77.192_27
deleted file mode 100644
index 4fffef886..000000000
--- a/data/route/172.23.77.192_27
+++ /dev/null
@@ -1,4 +0,0 @@
-route:              172.23.77.192/27
-origin:             AS4242422279
-mnt-by:             MOOHR-MNT
-source:             DN42
diff --git a/data/route6/fd09:ec7b:bc88::_48 b/data/route6/fd09:ec7b:bc88::_48
deleted file mode 100644
index 46aac63a4..000000000
--- a/data/route6/fd09:ec7b:bc88::_48
+++ /dev/null
@@ -1,4 +0,0 @@
-route6:             fd09:ec7b:bc88::/48
-origin:             AS4242422279
-mnt-by:             MOOHR-MNT
-source:             DN42