diff --git a/data/aut-num/AS4242420180 b/data/aut-num/AS4242420180
index cbcc2af2d..f235f5d6d 100644
--- a/data/aut-num/AS4242420180
+++ b/data/aut-num/AS4242420180
@@ -4,5 +4,4 @@ descr:              Gatuno Network ASN
 admin-c:            GATUNO-DN42
 tech-c:             GATUNO-DN42
 mnt-by:             GATUNO-MNT
-org:                ORG-GATUNO
 source:             DN42
diff --git a/data/inet6num/fd42:470:f0ef::_48 b/data/inet6num/fd42:470:f0ef::_48
new file mode 100644
index 000000000..b6180e4dd
--- /dev/null
+++ b/data/inet6num/fd42:470:f0ef::_48
@@ -0,0 +1,9 @@
+inet6num:           fd42:0470:f0ef:0000:0000:0000:0000:0000 - fd42:0470:f0ef:ffff:ffff:ffff:ffff:ffff
+cidr:               fd42:470:f0ef::/48
+netname:            GATUNO-NETWORK
+country:            MX
+admin-c:            GATUNO-DN42
+tech-c:             GATUNO-DN42
+mnt-by:             GATUNO-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/inetnum/172.22.200.0_25 b/data/inetnum/172.22.200.0_25
index fd8006d94..c2ca793f9 100644
--- a/data/inetnum/172.22.200.0_25
+++ b/data/inetnum/172.22.200.0_25
@@ -4,6 +4,5 @@ netname:            GATUNO-NETWORK
 admin-c:            GATUNO-DN42
 tech-c:             GATUNO-DN42
 mnt-by:             GATUNO-MNT
-org:                ORG-GATUNO
 status:             ASSIGNED
 source:             DN42
diff --git a/data/inetnum/172.22.201.0_25 b/data/inetnum/172.22.201.0_25
index abc86c77b..7e789bed6 100644
--- a/data/inetnum/172.22.201.0_25
+++ b/data/inetnum/172.22.201.0_25
@@ -4,6 +4,5 @@ netname:            GATUNO-NETWORK
 admin-c:            GATUNO-DN42
 tech-c:             GATUNO-DN42
 mnt-by:             GATUNO-MNT
-org:                ORG-GATUNO
 status:             ASSIGNED
 source:             DN42
diff --git a/data/organisation/ORG-GATUNO b/data/organisation/ORG-GATUNO
deleted file mode 100644
index 59eea8d0e..000000000
--- a/data/organisation/ORG-GATUNO
+++ /dev/null
@@ -1,6 +0,0 @@
-organisation:       ORG-GATUNO
-org-name:           Gatuno Network Organisation
-admin-c:            GATUNO-DN42
-tech-c:             GATUNO-DN42
-mnt-by:             GATUNO-MNT
-source:             DN42