diff --git a/etc.hosts b/etc.hosts
index fc88c41..0f03ac0 100644
--- a/etc.hosts
+++ b/etc.hosts
@@ -11,8 +11,6 @@
 2001:630:3c1:164:30a2:6e7b:c58b:cafd donna.i
 129.215.197.11 eddie.i
 88.198.164.182 enklave.i
-52.59.172.193 eva.i
-2a05:d014:301:a601:ef0e:5434:d814:b8ed eva.i
 95.216.112.61 eve.i
 2a01:4f9:2b:1605::1 eve.i
 162.248.11.162 flap.i
@@ -62,8 +60,6 @@
 42:0:3c46:126:3b9d:8298:f1b5:86d eddie.r
 10.243.27.30 enklave.r cgit.enklave.r
 42:0:8809:2ef1:f4d5:6338:daa4:ba68 enklave.r cgit.enklave.r
-10.243.29.185 eva.r
-42:0:3c46:8a42:2b1:5ef8:7562:676a eva.r
 10.243.29.174 eve.r
 42:0:3c46:70c7:8526:2adf:7451:8bbb eve.r
 10.243.189.130 filebitch.r
@@ -94,8 +90,8 @@
 42:0:3c46:53e:e63d:e62a:56ea:c705 homeros.r
 10.243.226.213 horisa.r
 42:0:e644:9099:4f8:b9aa:3856:4e85 horisa.r
-10.243.77.3 hotdog.r build.r build.hotdog.r cgit.hotdog.r irc.r wiki.r wiki.hotdog.r
-42:0:ca48:b3a6:3560:2208:e86a:c7d6 hotdog.r build.r build.hotdog.r cgit.hotdog.r irc.r wiki.r wiki.hotdog.r
+10.243.77.3 hotdog.r build.r build.hotdog.r cgit.hotdog.r irc.r
+42:0:ca48:b3a6:3560:2208:e86a:c7d6 hotdog.r build.r build.hotdog.r cgit.hotdog.r irc.r
 10.243.133.114 icarus.r cgit.icarus.r
 42:0:ce16::1205 icarus.r cgit.icarus.r
 10.243.29.172 inspector.r
diff --git a/hosts/eva b/hosts/eva
deleted file mode 100644
index 9074a02..0000000
--- a/hosts/eva
+++ /dev/null
@@ -1,20 +0,0 @@
-Address = 52.59.172.193 655
-Address = 2a05:d014:301:a601:ef0e:5434:d814:b8ed 655
-Subnet = 10.243.29.185
-Subnet = 42:0:3c46:8a42:2b1:5ef8:7562:676a
-
------BEGIN PUBLIC KEY-----
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyHptaExEcSUjEJ+RH33h
-uRK0Ttq8mJLDosWFYcoQkcL9S54aO9kF1gRJAKPBHoOt/IGeOxg2LNYWK6UjWfUy
-LB9c42EQ1wWZ2jSJ0LJgYzjR9cp3dlo9aHSa//O6p6eLpXRo9QLf8+aIWhNW5+BG
-sLIMR5b6Ngc2l8xQS+wvMmvTWJt3LyfQ6AKiKwCjeyrUFiuw0VWSn1I6n7H+CZBZ
-f/UvSxLucy1e0rvbHoTITOflIAfA84iCHsHsZjVqrx1iyOMdPtY2sBPmWhtVemDo
-duwzUpIuaJnWS7JOB4jsYWm672/KfzK7yAivqxD19OwqfZ3nNQ7sEDb3p4udw2Lf
-0dqHwZ5Hoj21vs3XiXX/SHcSf5QLzpj1MWBkV3r1D8I8v3P5qUbLunCofp3d9GxE
-N0gK06gqbLNonJvC/WD7lxeY32Rh1wYXbzbD/X6aWe/oD8WMIl312hH4cHQHOnVT
-t76NISlYTPxwX5mfFsBm8t0GjnnWY2jLwaefk7N/CwoDaKhkhmw1oeAZMuRcDRvE
-0ecpO4CZ6CcYERLxoYHgEAj3cMkSrQ8dT6XS4b9EO4hW4zCQ3RK9xDz71+uaihuB
-6uuTTsn7s0PYBJDNdccOf1Qt8fqPPgzqUKqeUciHojYDDPTC5KQh5m2PBv4I4iIR
-LnKOqNUX7UCqbdaE/tfFRG0CAwEAAQ==
------END PUBLIC KEY-----
-
diff --git a/hosts/eve b/hosts/eve
index 260d142..99d12f4 100644
--- a/hosts/eve
+++ b/hosts/eve
@@ -3,7 +3,6 @@ Address = 2a01:4f9:2b:1605::1 655
 Subnet = 10.243.29.174
 Subnet = 42:0:3c46:70c7:8526:2adf:7451:8bbb
 Subnet = fd42:4492:6a6d:500:8526:2adf:7451:8bbb
-Subnet = 42:0000:002b:1605:3::/80
 
 -----BEGIN RSA PUBLIC KEY-----
 MIICCgKCAgEAw5cxGjnWCG8dcuhTddvGHzH0/VjxHA5V8qJXH2R5k8ki8dsM5FRH
diff --git a/hosts/harsha b/hosts/harsha
index e0b0508..2dc578f 100644
--- a/hosts/harsha
+++ b/hosts/harsha
@@ -2,11 +2,11 @@ Subnet = 10.243.29.184
 Subnet = 42:0:3c46:5d34:82f:51ab:a472:2923
 
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqIc+ozq3hKHMe/X3v4j+6or8LMjEV7MtQ8/+n00xpG4NkI4G38Bv
-3nmAcV7OhN6of0fr0psbBmym+2VxCZbpl8E3g1GWSKpAvlmP/9v4wDVdrADaTvXC
-pzCxejtCwEhKLisnMwCMJCuUPbIsSBU+IQDPKP7NP0yY5VapgW3Xl3qXpnehCW1r
-NBZjZASnhSXcJRLJayEDN6uBviYrnnfbrHOx4fPcjQPTHX5RYr3EbgGZQO9xki44
-9dKT4EA95lupTqC3wzuQbaNpvIuVzmggiDY/NsBIVh0/2XjGnO54wtCEPudaLnWd
-WNtc1wfVFB6gzgG1N7msOuFUReOIfyF/ywIDAQAB
+MIIBCgKCAQEAr0rfJkcwOOMGDOKlS2GY+f8RHRLfLYD5Z1ZUb2vhAmZpUKwwCD7r
+mBEk7GGpx0dQ5+4jOpaiY7+nzo/yIPXqinnmj8fGRbSyyKkDT53TmnBCLfhQGIVC
+MtKzifokBLfZfOHotBzgRgvbJ28SUkqJ6kfHsHYAg98V5xUtdSRR8h0wcP0CSamc
+JTz6c9420XZOSOlDgVM+JXd0d57xxFLIdREu3RVpTSn3ktpxIGWA1VtrMxei3Z83
+uBid61TJOWp1ordZQnekuyZFLzE4ulGY6gRWqGBRjC/iIbhlV35Efy7VSKOBBzwm
+oP/gQC58StO64WsnOU5Un1N64xFPsJas9wIDAQAB
 -----END RSA PUBLIC KEY-----