diff --git a/data/key-cert/PGPKEY-30313ECD b/data/key-cert/PGPKEY-30313ECD
deleted file mode 100644
index 58b8ef266..000000000
--- a/data/key-cert/PGPKEY-30313ECD
+++ /dev/null
@@ -1,37 +0,0 @@
-key-cert:           PGPKEY-30313ECD
-method:             PGP
-owner:              Jan Astrup <jesastrup@gmail.com>
-fingerpr:           8238 0827 805E 7C1C 0BAF 37C2 8A1B 6457 3031 3ECD
-remarks:            
-mnt-by:             BITBAKERS-MNT
-source:             DN42
-certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
-certif:             
-certif:             mQENBF7eJUEBCAC33w/9Q1kiGOASiCSaN7PRXYAVvHJsm4Scbzi9bM2FOPST7KSl
-certif:             JjRvNOCSicV5yjx9Zotx4kTsBV0u6/PJUm/8wnWhlUFlqY/GeDBT1ZCSwaD/xgKq
-certif:             A2fQKu2FVDEyEari9pXNsddPJTh9h5G25cvw1SflbpBL4K0tRvestwfBUmV8IxY1
-certif:             5x6zUm5d9sSyM6od9ydYPgqcvqpSLka8Ki+F5+++PuU+zB6NcT25n0hrarzQ/3Dd
-certif:             FJ/m8xTUWRQ8nTPxD3zc/AJyQhTCJB5xA+gz6plToDWGzw1ZarBaDBFiyFFlj6Ce
-certif:             BdKEMXVTMVcWoU7qSrOaIenIIPJ6fC9joVQTABEBAAG0IEphbiBBc3RydXAgPGpl
-certif:             c2FzdHJ1cEBnbWFpbC5jb20+iQFUBBMBCAA+FiEEgjgIJ4BefBwLrzfCihtkVzAx
-certif:             Ps0FAl7eJUECGwMFCQPCZwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQihtk
-certif:             VzAxPs18igf8Cx/owkxJ8aDBBRDEhr9jbI8Efsv8/Fl0ry5/kO/q1girXqozamdk
-certif:             aT2rX7ZEIPpBkNnTahII5gpM9P3lCv1VCXS+yaLgMKoWEfLNMlnKiuDwy6Bci9wt
-certif:             BP59ziVWtun0jRYn8BE4ysOo6KtSFYtrkiDgoX5fYToZv14+ykLE5keF0RHsFZ9c
-certif:             BUbZEm/9weAx5jegLY9JYjTelVINdv8FNQCECFp+7BKU9v56aLLuCeTG84kq3AeN
-certif:             68nXB7BcXM/h97VnucHUTFTtbANoo7WNrqEy2Ou0c7u0JIs0YvJ2e0OjDYZvvCJs
-certif:             Lqlj1/Z3P588bT5CZfO71eJ7L1z2TlqjRLkBDQRe3iVBAQgAxvR5ZIXQ+6LlX9c/
-certif:             govTyMbGhjagdlk+sw/DEjt7uxEnEy1Q/V50ONbbsBN7iihFZsIcm7GflcBsUZ7p
-certif:             jzjjgJws4Q8RAdB1EsY8/em0Pg1vgyP6opqy5oIuMOZMXtcMJQiDiAljGcUAL0pj
-certif:             pJt17dawvepLB8eBqidc1dj7khl+alRz+YNzU08ofb0RT/RYOmSbaJ6k8JrgODQv
-certif:             5u9wQQxf+SJNKlaww8/e6xPYqMbKBNO9xO9jD6osFz/cVM4UJ9b4Pv9yRaCci9FN
-certif:             VwxGWoWXsGq3R5q5XEyIoRZ6eXR8fHIDsbMWGr2WLW0XR95oc+04YYciw7tofIV1
-certif:             Nf6m7QARAQABiQE8BBgBCAAmFiEEgjgIJ4BefBwLrzfCihtkVzAxPs0FAl7eJUEC
-certif:             GwwFCQPCZwAACgkQihtkVzAxPs230Af/SxcS7dHScA9GBLdRHsnhGPA1lI742Oyj
-certif:             xEGRTAz3SDK+5IL7X7hgskHLxOGMwPZViPNi+OcK6925RELf6ypxdjEJ6oT4r3Zj
-certif:             t6LIwab5Z0SngBSwqAQbjdGynLPtK1fj7z7C4D9PwkPzAVu/eTkvslzhN88enwza
-certif:             hm646FOZbWRA7LiBdFbHjf9H+J/HIiYGYVrm/SEBz3WJBj4gv0BYbhad3kdGw2Ja
-certif:             +dYAm+Y6WSiFgW+RonajbuJm2N30uY4sKOgi0IPPu180hdCGIyeYPlZVQMm1smXH
-certif:             tLAVJwBAW0POmkv3qIiutqQK1It9wc/YcRAK9CZHrOC5qxegfgvfoQ==
-certif:             =6hn2
-certif:             -----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/mntner/BITBAKERS-MNT b/data/mntner/BITBAKERS-MNT
index 82039f79e..3f588a025 100644
--- a/data/mntner/BITBAKERS-MNT
+++ b/data/mntner/BITBAKERS-MNT
@@ -3,6 +3,4 @@ admin-c:            JASTRUP-DN42
 tech-c:             JASTRUP-DN42
 mnt-by:             BITBAKERS-MNT
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCZPwbhiTmIWMUgihcJJQQRDDcUqQzKfYQMOP6diOKMgVJG4FaQANeIHQYoYlDb031VA32IBNTRtJdg5oIGkbeoWZBJiq9nkehWIXMamNDicGi7iupwOt0HmgFL+NNHv53rHQoi4WG3YZqe24vug5GmyxUZnbNawKPMpCiImvp0lwjA6/lMsCB9JpqTBOdPX5O41pfsUPpOZk7hdLZEOyou3mFLpDV1+9lPUbC67noJ/qEsP9mRkjGzcOgNgoPOeZDkM/arEyyLJ/pkTO+xoXKr6sgGaS0EpSkBQqJiMaFTYFBLrbKG8nQqf749WlPKh5ixrmy6kH/vSxQBBP09Czr7s85LPNfvyzzd3o5+0VQIed1tMe18PbC5uIj40qfeRn8bxt7D/31R6XFUPC0ZZ7tg0FgeqSWfB414u54mP0bOvd4wXe2hsMRDJHAge7QPJhlYQlUCI2/vItnjnuBA71Uq+1TBxY61rmyqBjvyP2E29HFmxEb421HjxrvpcXLMyJk=
-auth:               pgp-fingerprint 82380827805E7C1C0BAF37C28A1B645730313ECD
-auth:               PGPKEY-30313ECD
 source:             DN42