diff --git a/data/aut-num/AS64515 b/data/aut-num/AS64515
deleted file mode 100644
index 9bec25ce2..000000000
--- a/data/aut-num/AS64515
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:           AS64515
-as-name:           MORGAN-AS
-descr:             MORGAN's AS
-admin-c:           MORGAN-DN42
-tech-c:            MORGAN-DN42
-mnt-by:            MORGAN-MNT
diff --git a/data/aut-num/AS64645 b/data/aut-num/AS64645
deleted file mode 100644
index 3e3ac1969..000000000
--- a/data/aut-num/AS64645
+++ /dev/null
@@ -1,5 +0,0 @@
-aut-num:           AS64645
-as-name:           CHOWN
-admin-c:           VIGDIS-DN42
-tech-c:            VIGDIS-DN42
-mnt-by:            VIGDIS-MNT
diff --git a/data/aut-num/AS64679 b/data/aut-num/AS64679
deleted file mode 100644
index 254d57956..000000000
--- a/data/aut-num/AS64679
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:            AS64679
-as-name:            KAZAMATZURI-AS
-descr:              kazamatzuri's AS
-admin-c:            KAZAMATZURI-DN42
-tech-c:             KAZAMATZURI-DN42
-mnt-by:           DUMMY-MNT
diff --git a/data/aut-num/AS64694 b/data/aut-num/AS64694
deleted file mode 100644
index 788b367fd..000000000
--- a/data/aut-num/AS64694
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:            AS64694
-as-name:            MITTAGESSEN-AS64694
-descr:              mittagessens AS
-admin-c:            MITTAGESSEN-DN42
-tech-c:             MITTAGESSEN-DN42
-mnt-by:           DUMMY-MNT
diff --git a/data/aut-num/AS64700 b/data/aut-num/AS64700
deleted file mode 100644
index 44fe4f6b9..000000000
--- a/data/aut-num/AS64700
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:           AS64700
-as-name:           LMI-AS
-descr:             LMI Central HQ
-admin-c:           TACOSUN-DN42
-tech-c:            TACOSUN-DN42
-mnt-by:            TACOSUN-MNT
diff --git a/data/aut-num/AS64715 b/data/aut-num/AS64715
deleted file mode 100644
index 634c8d6af..000000000
--- a/data/aut-num/AS64715
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:            AS64715
-as-name:            TOMATO-AS
-descr:              Tomato Notwork
-admin-c:            TOMATO-DN42
-tech-c:             TOMATO-DN42
-mnt-by:           DUMMY-MNT
diff --git a/data/aut-num/AS64921 b/data/aut-num/AS64921
deleted file mode 100644
index 5f47b642b..000000000
--- a/data/aut-num/AS64921
+++ /dev/null
@@ -1,6 +0,0 @@
-aut-num:            AS64921
-as-name:            ION6-AS
-descr:              ion6 networks Inc
-admin-c:            ION6-DN42
-tech-c:             ION6-DN42
-mnt-by:             DUMMY-MNT
diff --git a/data/aut-num/AS76156 b/data/aut-num/AS76156
deleted file mode 100644
index f2c5b0bd1..000000000
--- a/data/aut-num/AS76156
+++ /dev/null
@@ -1,5 +0,0 @@
-aut-num:           AS76156
-as-name:           SSC-AS
-admin-c:           SSC-DN42
-tech-c:            SSC-DN42
-mnt-by:            SSC-MNT
diff --git a/data/mntner/ATLAS-MNT b/data/mntner/ATLAS-MNT
deleted file mode 100644
index 2c1000bc9..000000000
--- a/data/mntner/ATLAS-MNT
+++ /dev/null
@@ -1,5 +0,0 @@
-mntner:            ATLAS-MNT
-sha512-pw:         MzZiYTAyN2JiYTEzNTQ3Y2I5ZDYzYzI3NDIzODYxM2NhODQ3ZTc2MTQ2NzE4ZWIwNDg3NDI4YTEzZjFlYzVlYzA3MzRjNDQ1ZWFlMTJiYjJlNzUzMmNlZDVjY2E3N2FlODY3NmU2MTE3YTZiODVhYTRkZGE5M2YzZmNjMjZiNGExOWQ3OGY0YjdhMGI4OTYyMjc2ODgxNDQyZjQwMjM4NGEzMDY4ODNiNmNhOGJlMmJjZGY3ZmI2ODQ2NThhMmEyZTIwZWM1MGVhNjA3ZmVjZTMxMmMwNzVhZjMyYjI5YzE4YTM1MGQxNjU3NjAwMzlkZThhMThkYWQ0NjhlYWZmNDg5OWYyOGUzNTJmMjE3Yzg1YjdkNzkyZjIzMDY3OWY4Y2VhNmU2MDA4MDA1MjE3N2E2NDlhYjdhNTRjYTBhNTg2ODI0ZmU3ZGM2OWZlYTE5ZDBmNmUyN2RmN2IzZjFmMjdlMzViNGVkMDI4ODU0OTQyNDRjNDYyZmIzY2JlZDNhMjJlOGQ0OTIyMzA4OTU4ZGZmNjI5Y2ViZTE4NTAwNDY4ZGExMTYxNDZlNGE5ZGY3MmRmMjFiM2I1OGE0Y2NmY2RmMTJiNjVlZDVhNDIyOTcyYzIwYmY0M2UyOGM5NzUwYmM3MjdmYmMyM2JhYTExNjVlNGE0Y2JhYWU1MjA0YTc=
-admin-c:           ATLAS-DN42
-tech-c:            ATLAS-DN42
-mnt-by:            ATLAS-MNT
diff --git a/data/mntner/SSC-MNT b/data/mntner/SSC-MNT
deleted file mode 100644
index 1d11c66a0..000000000
--- a/data/mntner/SSC-MNT
+++ /dev/null
@@ -1,5 +0,0 @@
-mntner:            SSC-MNT
-sha512-pw:         MTE5NmFjZGIwYjA2NTI0ODM4ODM4MjA5MjEyODc2MDYzY2FiOTFhNWMzNTk5NzdmY2MwMzdhYWQ4NGIyMmI3MmVkZDBiYTMyZmE4NTUyMjQ3ZjdjOTNiOGZkMjc0YmZiYTJkNjk2MTUyNTk4ZGUwNzIxOTY4NTYxNzY4NTVkMzZmMjM4YTI3NmU0YzJhNWQ3Y2ZjYjMxNTJlMjAyYzZjYWIxNWJmZjMyMmRiYTE0MjM4Y2Q1MWUwMTM5MmRlN2ZlNGVmY2Y2M2Y1OTZiNDg5NmIzMDdiNjgyZjlkMDliMWQwNWNkNWQ4Y2RlZTFiMWNhMGU3MmYzOGM1MDI0MDJhYWIxYTAyNWQ5N2IwOWE2N2RiOWRhZjM5NDlhMjM0YzZmOGFkYmM4NzQ3NjYyM2U3NTA5YmM1ZjVjMzBjOGE5ZDNmNGYwNWVmZDhlMmJlNDE2MDE2NzRiZjRkYjcwZTViNTZmNTg1ZTI0ZDBjNjY0MThhNDk1OGE4YjljZmQ5NDFiYmY3ZWMwMzZlNWY3ZTc0OGM1MTI4MWU5ODE3MGViNTA4NzVkNzcxZjIwNDI1MGIwNmExN2FmMzU3NGVmYmQ1MWE5M2NhMGEzODE1MDk4YTc3YjlhNTI5Yzc4NmMwMTU3OWZkY2RkN2U2ZjI5NGEwMjg5YWMxOGQ3MmZhYmMxZjQ=
-admin-c:           SSC-DN42
-tech-c:            SSC-DN42
-mnt-by:            SSC-MNT
diff --git a/data/mntner/TACOSUN-MNT b/data/mntner/TACOSUN-MNT
deleted file mode 100644
index 522652b57..000000000
--- a/data/mntner/TACOSUN-MNT
+++ /dev/null
@@ -1,5 +0,0 @@
-mntner:            TACOSUN-MNT
-sha512-pw:         NThjMzkyZGVjOWIyZWZjNGMxMDhhZDg1YjU4MTRlNzYyZGFlZTQyM2JmNDA0YmMxMDkyN2YxZDBhNzkxYTM1MzhlZjZhOTgzZmMzN2JmYjM4ODhmZmQ3ZjIzOTFjNjFhMjVjYWQzZWEyYzc1NWRmMTk1ZDJmM2QwNWE3Y2MzZDZmNTE3NzYzMTU0NmVhMWQ0Yjk5Nzg2N2VlNjM2NjU2NTE0NzE4MWE3Y2FlYjUxMzI2MDZjZGY1ZjA4YzFhZDNiMmVkODliNTRhZjRhNDI5NjdjNTNjYzE1ZDQ0YjJjMmZjNWYxMzBlMTY4ZGYzYTZlY2UyOWVjOTEyNTRmYWNkNDE4N2FlNTYxZjViNDk3NWJjOWM2NjI1OTA2Mzc1ZjE4NDI4YzYyNTJkYTA5NDk4YjI5ODgwZmYwOTZhZDNmYTczZDlmY2UzOTcyYjgwODdlMmVkYzc4ZDIyNjdkNTk2MDUxYTk4ZGQzY2E5ZjI5NGNjNDIwMDhlMGEzZTI4MjQ0ZDUyNTMxYmE0MjhkNDU4ZTNhODJkNGJjMjNlMDk0NmNjZTllNzY4NDIxODZkOGQ5NjllZDQ5YmViNWY0Y2ZiZTUyODk3NDIwZmFkZTA2YzlhODM5NGM0NDk4NjEyODNmMGJiMTk2M2NjZjkwMzE4ZmQ5MDM2YmU4ZTA5NzEyMjQ=
-admin-c:           TACOSUN-DN42
-tech-c:            TACOSUN-DN42
-mnt-by:            TACOSUN-MNT
diff --git a/data/mntner/VIGDIS-MNT b/data/mntner/VIGDIS-MNT
deleted file mode 100644
index 9e841e025..000000000
--- a/data/mntner/VIGDIS-MNT
+++ /dev/null
@@ -1,6 +0,0 @@
-mntner:            VIGDIS-MNT
-descr:             VIGDIS-MNT
-sha512-pw:         MDBmZjhlYmIwYzc0MWJhNjQ5NzRkZmU1MWQxZjc4YjFjNmMzYTljNWMzZWRkNjNlZWM3ODU2MDU4ZmM5OTE0ZjBhMDQyOTM2ZTc2ZjRlNGQ3OTY1ZGY1NzUwOTI4YTYzMmRjZmZiM2JmM2JkNTA5NjYwNmM4NmE2YjZiZThiOTRhYmU1ZTUwMDM1MjhmOGU5ZjAyOGRjOGM4ZGEzZDg1ZWRlOTAwNzAxMWM0MjcxY2ZlNTI1OGRkNWIxMGE2YzI3ZDU1NzBmYmZjNDRmMTE0NjM0Mzg4ZWI0MjU5OWI0NDIyZjExNGY1NjE5NWY2OTE2Mzc3MjkxNzljNDkxMjAyNjg1NDdmN2IzN2UwZTMwOTgzNzA3YzdmNzM5ZmQyNjI4ZDNmMjU5NDI4MTY0NWVhMjZjNTllNmFkMzZkYTIwYjViZDYxMzQyMzMyYmFhNWM3YTY3ZDk2NDc3OWIyNzdjZmNhOGM3ZjQ1NDU3OWM2Y2U4NThjNzg4NTlkY2E0MDI3Njg3ZjI2MmQ4YTU0MzQ0ZTQzNmJlNTgzOTYxNDMyYjQ3NTMyNGFiYjI4OWQwMmYyNzAzNGNjODdlYTZjYmViYWQ1NmQ5NGM0OTE4NjFiNDU5NjU4YWE5ZGEwN2JkMzZmMmVlNzU4NWFlYjQzMGE2ZjFiMTE2NGIxMjdlZjFiYTI=
-admin-c:           VIGDIS-DN42
-tech-c:            VIGDIS-DN42
-mnt-by:            VIGDIS-MNT
diff --git a/data/organisation/ORG-SOROK b/data/organisation/ORG-SOROK
deleted file mode 100644
index 1d8b79466..000000000
--- a/data/organisation/ORG-SOROK
+++ /dev/null
@@ -1,5 +0,0 @@
-organisation:      ORG-SOROK
-org-name:          SOROK
-admin-c:           AKS-DN42
-tech-c:            AKS-DN42
-mnt-by:            SOROK-MNT
diff --git a/data/person/MIRSAL-DN42 b/data/person/MIRSAL-DN42
index 10eb4c1af..13f225c14 100644
--- a/data/person/MIRSAL-DN42
+++ b/data/person/MIRSAL-DN42
@@ -2,5 +2,5 @@ person:     mirsal
 contact:    mailto:mirsal@mirsal.fr
 contact:    xmpp:mirsal@mirsal.fr
 nic-hdl:    MIRSAL-DN42
-nic:        mirsal
-mnt-by:           DUMMY-MNT
+nick:       mirsal
+mnt-by:     DUMMY-MNT
diff --git a/data/person/RZL-DN42 b/data/person/RZL-DN42
new file mode 100644
index 000000000..0005f42b3
--- /dev/null
+++ b/data/person/RZL-DN42
@@ -0,0 +1,4 @@
+person:    RZL
+nic-hdl:   RZL-DN42
+mnt-by:    DUMMY-MNT
+