removed bleeding and jessie env

13 files changed, 0 insertions, 234 deletions

diff --git a/files/cert/jessie.bitmask.net.crt b/files/cert/jessie.bitmask.net.crt
deleted file mode 100644
index cdb34b8..0000000
--- a/files/cert/jessie.bitmask.net.crt
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQNm2qu6HlRgepoSD6D4XirTANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTUxMTA2MDAwMDAwWhcNMTYx
-MTA2MDAwMDAwWjAvMRAwDgYDVQQKDAdCaXRtYXNrMRswGQYDVQQDDBJqZXNzaWUu
-Yml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDZI5G4
-45ra3PrStfwEf2DG89mEmUn8lg3kK0WSegPGi+Fb8b7eWz6cM+Lv2rWHVAWlQEcy
-JkSG4qcMZTlJ/8JDVqPnxF/CrcjsHt73/nxvzoHBkdy8NqttuSorZuDHgtWTc+N4
-Y6TQRyVbswCRcJ9T1Z8kkWdzqY+jPB105l62S6nsoLb57L7w909fyQc7K9qzrc7T
-98dTXINeLSmWWqNiUCn+YznjmXk5XE0dfwWE4O4FNb6X8ShcfLNjEAoyof6GP+Kv
-C2D+FuFKiePKZ0FF1gTGfduBkmEhIX6vmrWUTxjuv4eD6ZdZLByHdpNxJGEcxZwm
-pDiDdCDeZ1NWZBuREzKJsiaJgek2frZQpUOxaLZHBUYEE/RbjrYJuor+dKYpJ/Oe
-q2jYwmuQuhCwW/nbW33wUFeV3I6DYqs6upZWNIjD5WfE2OyWmMNBoqHq4DQK2Ded
-4MuFkhrFt3r4nctESLE3ZrJJ+wXBANiuOPKpVzChpHUmHAM9Oml6VNW4+O3KgBzJ
-bfRfEl1NC6QBH7L0THS7RxvN9h06jSAbx7BIOwAjradDDHAaMPslAZWwJZ4ZYk0j
-tbaVqg2WN5e0P51JiERV0AQPBm04CILetg1r7EEI4WEIiGngErnGwsDO4v/srFbY
-a0hq0gOBnkhFfrJpgibz+I7iQskK7AVjKqo0rwIDAQABo28wbTAdBgNVHQ4EFgQU
-aimXonAV7IVCn5farMvswEV1nEQwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+
-D48wDQYJKoZIhvcNAQELBQADggIBAAFDars48h+l9Q1lqZJ+Y2EiogzFi7QuZAnr
-qSwYym5iPRp58xlAJo83uMsrQ6tvaFD4aCM8tKWxrTANpBlxFXwXJuqTtv3P6Bn2
-CstOqNloeP77NutM/OxFZDwQmP641HPkvIPQ8p9j0g/Zqy/Ui+LbTRovRZpKAFHz
-Me2rDRyPs+84mDaUQCkGhH9CCqghpaEBNdJvTGIM/ZdkWNY7N9N1vAlb0/Syp3Y9
-hLoOsHKYt7FbUWm/np2oERxcsqb+DIr1zmq7RCwv5mPsONsyl5B+iz7O90Mh4zxk
-CI4nDAtJhwWANmdRRc4U/wwfIp8J2VMjfXeAquup42MwBZE9NuWJMkmyxLJMCmjw
-WlLWo34cfyod7pv2vOMy/hzIvd/VmSx6HKBZg/pmeCLVRke8/zq8gjdsAqXOGMcT
-pVt1M0ji6o6WD5vHBBp7EDOf4hlZ0SK88JJIOoZWI0yVCkbQjtgN22E53Y1ADAj7
-Neqctj4znIqS4WzIAg+hOpDmNYlvlBTrxecoUWELuGeUsc+cXVxPpI8ZZhSX4ObY
-l26mH0XBrt+0f7BdDoK7kalgABaKj57zxMUbHA0O06+Wsdm7vTEW6uE9sqVjEEbI
-9bqYl4GCp3uS7ZCDHfShvFxpDIzGf6kQLfNyBfra+qT6NykAGyVC88TRN1KoPp8/
-bZh/yF7i
------END CERTIFICATE-----
diff --git a/files/cert/jessie.bitmask.net.csr b/files/cert/jessie.bitmask.net.csr
deleted file mode 100644
index 119f4cb..0000000
--- a/files/cert/jessie.bitmask.net.csr
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIEsjCCApoCAQAwLzEQMA4GA1UECgwHQml0bWFzazEbMBkGA1UEAwwSamVzc2ll
-LmJpdG1hc2submV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2SOR
-uOOa2tz60rX8BH9gxvPZhJlJ/JYN5CtFknoDxovhW/G+3ls+nDPi79q1h1QFpUBH
-MiZEhuKnDGU5Sf/CQ1aj58Rfwq3I7B7e9/58b86BwZHcvDarbbkqK2bgx4LVk3Pj
-eGOk0EclW7MAkXCfU9WfJJFnc6mPozwddOZetkup7KC2+ey+8PdPX8kHOyvas63O
-0/fHU1yDXi0pllqjYlAp/mM545l5OVxNHX8FhODuBTW+l/EoXHyzYxAKMqH+hj/i
-rwtg/hbhSonjymdBRdYExn3bgZJhISF+r5q1lE8Y7r+Hg+mXWSwch3aTcSRhHMWc
-JqQ4g3Qg3mdTVmQbkRMyibImiYHpNn62UKVDsWi2RwVGBBP0W462CbqK/nSmKSfz
-nqto2MJrkLoQsFv521t98FBXldyOg2KrOrqWVjSIw+VnxNjslpjDQaKh6uA0Ctg3
-neDLhZIaxbd6+J3LREixN2aySfsFwQDYrjjyqVcwoaR1JhwDPTppelTVuPjtyoAc
-yW30XxJdTQukAR+y9Ex0u0cbzfYdOo0gG8ewSDsAI62nQwxwGjD7JQGVsCWeGWJN
-I7W2laoNljeXtD+dSYhEVdAEDwZtOAiC3rYNa+xBCOFhCIhp4BK5xsLAzuL/7KxW
-2GtIatIDgZ5IRX6yaYIm8/iO4kLJCuwFYyqqNK8CAwEAAaA+MDwGCSqGSIb3DQEJ
-DjEvMC0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUH
-AwEwDQYJKoZIhvcNAQELBQADggIBAA5i98OyI5WnplhiKapW7/kYbSQBXC0dP/2M
-xJLQzna829j1X3m/RlPJIZP80cSefPGPFHEDvasArsGE0o3g2GOnlgsaF2gu2gOA
-9iIqI3IblpNKNDIlFkP4iKd5xqXc3jOS4IdclNE5vE4qqbd1Qi2Nr8fRP26LFUpi
-Ok7ja/93Uj/SI02EEdXKVp+ccTfjtXrPc3sPJ9Flbh+K6d3U1gFBvIDLHfcIbbmq
-868KHtRdaYov5XMOibE+VRx4wfqWQw/Bqdh3zQPKM8tpqnoUcVryrIcfF7MT3KSI
-r2722iTZRJmcoM8hblprum9cle4JmW1P/uMuBpNvCvs6Z2PAo1zIZV++ZjCbF4B0
-cYpXjaRVZAPJQl+g6aU9IleXOyQjkwpJK7OTB4ZBQLQMiLcfDKibIESAmpE9sNZw
-rScv0JKvbFIwwksHlN1/wOgtsgU9C3kuzDWwjeX2nJ4jt/0OpNblKRkCf0pU8h0R
-/yBQmHmVXrE3e96BoO/DzSnUQqQygwNqMUsGb0VfNS2ktGbP9HxXW/Kx98GSdfkH
-IzFvC5bXwgLq1vlFPY3jI7SaqCiVKZoZogbXhi3EK3icJYporWP3n2Yy2wmh3vwF
-cKRNhKumFPBKvKdSlmaf8rfCnZMFDblF5A/8tOpKXa0zazOlWEH0Fzt6FI7GfHMp
-r4FoOUyi
------END CERTIFICATE REQUEST-----
diff --git a/files/cert/jessie.bitmask.net.key b/files/cert/jessie.bitmask.net.key
deleted file mode 100644
index 5ca487e..0000000
--- a/files/cert/jessie.bitmask.net.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 88e1a67..63452c4 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -5,7 +5,6 @@
 aardwolf,aardwolf.unstable.bitmask.i,aardwolf.unstable.bitmask.net,199.119.112.205 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv
 ant,ant.demo.bitmask.i,ant.demo.bitmask.net,198.252.153.82 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI=
 antelope,antelope.mail.bitmask.i,antelope.mail.bitmask.net,199.119.112.167 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2YO7JEh12id6zSoAyq8uc1IIVpGMrv/JaNAX74R+nNdcFnezB2fZXDHr+FHdNg6Jfsy3KPTmNObWD/+T0HHcZVsuLULSKs/Drl/iYnfS9nzEoj9a2uS/Z4/kWAeCaiD8UoyXcB/4vi9Kq+NujtH9qHUM+FQJ3XSbJJYNqXucvl6i4mpGYS9E0piJJ6Nly26+OKTc9rT8x23vYWBtO7RDw+Z0fbfJKCd7KIgZvxukxDj+N/V6GxoyaybkzepR92q98xqMhZAiiuVLGpgI09Wc3YuKYCvOfNj6JFrKpDo52qJ2zaZXUPwS84b1aWhfwG7JV/T8qYqx4X03wn9fm+Scl
-armadillo,armadillo.bleeding.bitmask.i,armadillo.bleeding.bitmask.net,1.209.122.24 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/9xQU1KwCniVCHjGP52c0WXkh6L+ZkRR4Wq30cNIN5V1fYzBb2GdVaMBLNT68XFJHG7OrhC3HGsXLkEGyiCyHSNsvrMFBD4L3rx9R/RK8ORfgiKcjRjs8KQ9kGqCNYLYuhLf6HzqDkM3TAtfehTlymHsQjYZX7z+UWryAdghQMG8vQ8XONelvQ7I3iiHGtcxsv0lG8t5WUs4JOpiGuf/zrnz8M93M1PUnoJLi23YfR9Hs/kVHL84jCaalZ6AHRLD07oEkGvyIJghc8c8VMvYSngNHfjAmXQWhk1+J2CknJ6orVYLtoC+G82HlrAeISA7o41pO106JHSVdi2wuL32X
 cat,cat.unstable.bitmask.i,cat.unstable.bitmask.net,199.119.112.206 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV
 clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z
 cowbird,cowbird.cdev.bitmask.i,cowbird.cdev.bitmask.net,199.119.112.152 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCraaEPNaV43AZ2N0zlxwnGzaqsSU+sBtz3PlId1NZqYv27UYIXw1WKPPhLbdfcVQxM0pVSsTZ8hsfztGrRn9yW1JNzp59GjRxenOzCVen08YLlY9eKEI3UNB8nMh4HuVWxQGOiaqovCN3e0KcwImD7J35eOW14NCQ8zvzVHwIL/VhO+wpQ6ofJ0pFP78w/EZ/arbHIM4teWyRGJzcBe++kFqWoaj8Yxbdgo2ZW4iyqCwpaxLk7KHM2op/FSwrEs/cnlwyCq+xjP3QLjDT2TRgwEQycTGABhcqrJJ1SVo4sKE0DvjhVHsAy5OI296k7OE5pbGXn2ZUc2TsPUttdUajt
@@ -16,13 +15,11 @@ donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh
 elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDbVBsw4Hnwoh1h+/J5NP6Uj6s1ViumP6zeeAtrr/ma/NrvR3x1bXmy/O396zbuFER6a8EyhGwY6WI+vKTjKWMGlOaNyNO7s9CB/keFBx4GGTcx55oHFb/WU0BzFUBoLjfEgelx/03+NIrZyW2XaPYDPdmNOfxMtetBziLugTXsXONIZBD4/QCt+LvbYdjWtziCH/EsdFuetDZ+WZrrUjCHyg2Lm8Xd48U/QrfPUb0oP8QZfoToN5l2Mxx7CnxX1s606zc/kkeaiF6+ATUPJ/6CTTdXZUN3Mg9dFMMyyZLB4TpSX7ldnwE2Wkvc/ngQjS/L8YBoMxsywPw7Q2+rFlV
 firefly,firefly.dev.bitmask.i,firefly.dev.bitmask.net,199.119.112.149 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/jTfvvn8rS730j0VIlgHWUMeUHgtIPFLutHJfwH8HwGl27Osnn2DbK2SWGYkts9XymrLho3InFfF4PotdgecrMFFkRnvnPz/ZbQ1NqYRWcwAYbN7Za8+2zSpxpG9qNEQrcU+nE7OvMgNZZBDz5C3ConxYTUO3nyyEgw/gAS7hz4d2jwN9KoB+w10Si9yd6CAra43/h+371ABAoHkmcUfi1WJKHlxFv29J6ODlwrd4Zr1K5lCl8+m/1QM04RXxInmHGO3foFpH4qY3LaHcYr7xnmmPMRYIbJfZmOXgckgj65Gc+jFUuNj+B+fIzI7Jy4O/hpG+JPT/3XcINjakZFZb
 goldeneye,goldeneye.cdev.bitmask.i,goldeneye.cdev.bitmask.net,199.119.112.153 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0UeOcj5frFsFK6CxTojMr9M/Fg3/3yBmsMtEP/wGiEZ1uTmbuYSzYUicashNPrQ3NnXEmLfmQbumKT1BL2p+EtN942poQSKA3sQWNemTErJcPr3vNN5vXXcXNoTDd8WmUOOnWMw5CkMv9kkgEN2jYfQNR1olofUn7eB5e9Iu24d4IaTupLzT+e3Jh+nkH5Uqw/JMmMkoy6nvYt9OmSQ+fvZZnuMatGSgOSpLgjajIvR115ga8QYEiQ76ugO+K+afvrSe5k8/puH+Xh0B5x1OlwxaGfIfYpi9IITdzMVvr/kEop7FG4184FehdlWS5DcUPZT5dicZLVlntelU+hlLb
-gorilla,gorilla.bleeding.bitmask.i,gorilla.bleeding.bitmask.net,1.209.122.26 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr
 hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=
 ladybug,ladybug.bitmask.i,ladybug.bitmask.net,199.119.112.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo=
 millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
 ovenbird,ovenbird.cdev.bitmask.i,ovenbird.cdev.bitmask.net,199.119.112.151 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz
-quetzal,quetzal.jessie.bitmask.i,quetzal.jessie.bitmask.net,199.119.112.197 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqPePS18hnKkcLAxLqNAwM3QbDYpOT4LOpksDT45847vSFoSTFcj4Qd+aQr9pssTNBDTstKcjoLfzo+VTvlTOKd9vOBER1AvFSlNKGyLUGRg/1mdEpOMEbHGUaIimjwT59GdUC3R9dp0NCx5iWHb90MR1o2o4gMHXj5TEyJO2u7qIEMCRQslHiWpC6+qBWvs7coqpU65UrN4C/9thQv/9PibmFsmY3N3dKdxBrPfK+3Y52pMyD2DmbF408v0o6Py/W8kKjfhB2qjpkcUPU/OkpxWsdEy1lC+yI/s307ywkIWqG3oTPbzufKwS/ND80mBdRxXyMIU29aAg9PXeKWmWb
 seahorse,seahorse.bitmask.i,seahorse.bitmask.net,199.119.112.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1
 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD
 starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDoV279cN3/nTHprB8b5oJSkuUI8lQVLdn20ggfn62T7qRmcAmynCucxachXHplrSnrmYT9b63/ejQy1BZzuHANfuTqCt4YiWBtZFg6SW8tEpf3Rv40ZfPRU1jIC9Y5JFAALOcE80JvgNUy8/IPvb3xbPLr5d/LlqNqLeYQS0Y5DJyUI3g4z9NgbeM16/RSs6IFWUDUy81+ni1WTpPuOgC9Ws50d+03nWQcsYndwug3GsuafouYK8aoUlJQrppaL6G2PqqXQfyamaGkYTn1GeGzDUV3qCG36HcThZ/4IrAyeCQEfX8TeiWQoOCXILKhW3n0aOsXZuebid9Nw6FkBeAh
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 38e309a..21ee48c 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -66,8 +66,6 @@ mx:
   aliases: {}
   key_lookup_domain: unstable.bitmask.net
 mynetworks: 
-  - "1.209.122.24"
-  - "1.209.122.26"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -82,7 +80,6 @@ mynetworks:
   - "199.119.112.152"
   - "199.119.112.153"
   - "199.119.112.167"
-  - "199.119.112.197"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index aeb7b73..6a03039 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -201,12 +201,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2YO7JEh12id6zSoAyq8uc1IIVpGMrv/JaNAX74R+nNdcFnezB2fZXDHr+FHdNg6Jfsy3KPTmNObWD/+T0HHcZVsuLULSKs/Drl/iYnfS9nzEoj9a2uS/Z4/kWAeCaiD8UoyXcB/4vi9Kq+NujtH9qHUM+FQJ3XSbJJYNqXucvl6i4mpGYS9E0piJJ6Nly26+OKTc9rT8x23vYWBtO7RDw+Z0fbfJKCd7KIgZvxukxDj+N/V6GxoyaybkzepR92q98xqMhZAiiuVLGpgI09Wc3YuKYCvOfNj6JFrKpDo52qJ2zaZXUPwS84b1aWhfwG7JV/T8qYqx4X03wn9fm+Scl"
     ip_address: "199.119.112.167"
     port: 22
-  armadillo: 
-    domain_full: armadillo.bleeding.bitmask.net
-    domain_internal: armadillo.bleeding.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/9xQU1KwCniVCHjGP52c0WXkh6L+ZkRR4Wq30cNIN5V1fYzBb2GdVaMBLNT68XFJHG7OrhC3HGsXLkEGyiCyHSNsvrMFBD4L3rx9R/RK8ORfgiKcjRjs8KQ9kGqCNYLYuhLf6HzqDkM3TAtfehTlymHsQjYZX7z+UWryAdghQMG8vQ8XONelvQ7I3iiHGtcxsv0lG8t5WUs4JOpiGuf/zrnz8M93M1PUnoJLi23YfR9Hs/kVHL84jCaalZ6AHRLD07oEkGvyIJghc8c8VMvYSngNHfjAmXQWhk1+J2CknJ6orVYLtoC+G82HlrAeISA7o41pO106JHSVdi2wuL32X"
-    ip_address: "1.209.122.24"
-    port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
@@ -267,12 +261,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0UeOcj5frFsFK6CxTojMr9M/Fg3/3yBmsMtEP/wGiEZ1uTmbuYSzYUicashNPrQ3NnXEmLfmQbumKT1BL2p+EtN942poQSKA3sQWNemTErJcPr3vNN5vXXcXNoTDd8WmUOOnWMw5CkMv9kkgEN2jYfQNR1olofUn7eB5e9Iu24d4IaTupLzT+e3Jh+nkH5Uqw/JMmMkoy6nvYt9OmSQ+fvZZnuMatGSgOSpLgjajIvR115ga8QYEiQ76ugO+K+afvrSe5k8/puH+Xh0B5x1OlwxaGfIfYpi9IITdzMVvr/kEop7FG4184FehdlWS5DcUPZT5dicZLVlntelU+hlLb"
     ip_address: "199.119.112.153"
     port: 22
-  gorilla: 
-    domain_full: gorilla.bleeding.bitmask.net
-    domain_internal: gorilla.bleeding.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr"
-    ip_address: "1.209.122.26"
-    port: 22
   hippo: 
     domain_full: hippo.bitmask.net
     domain_internal: hippo.bitmask.i
@@ -303,12 +291,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
     ip_address: "199.119.112.151"
     port: 22
-  quetzal: 
-    domain_full: quetzal.jessie.bitmask.net
-    domain_internal: quetzal.jessie.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqPePS18hnKkcLAxLqNAwM3QbDYpOT4LOpksDT45847vSFoSTFcj4Qd+aQr9pssTNBDTstKcjoLfzo+VTvlTOKd9vOBER1AvFSlNKGyLUGRg/1mdEpOMEbHGUaIimjwT59GdUC3R9dp0NCx5iWHb90MR1o2o4gMHXj5TEyJO2u7qIEMCRQslHiWpC6+qBWvs7coqpU65UrN4C/9thQv/9PibmFsmY3N3dKdxBrPfK+3Y52pMyD2DmbF408v0o6Py/W8kKjfhB2qjpkcUPU/OkpxWsdEy1lC+yI/s307ywkIWqG3oTPbzufKwS/ND80mBdRxXyMIU29aAg9PXeKWmWb"
-    ip_address: "199.119.112.197"
-    port: 22
   seahorse: 
     domain_full: seahorse.bitmask.net
     domain_internal: seahorse.bitmask.i
@@ -357,17 +339,12 @@ mail:
 nagios: 
   domains_internal: 
     - bitmask.i
-    - bleeding.bitmask.i
     - cdev.bitmask.i
     - demo.bitmask.i
     - dev.bitmask.i
-    - jessie.bitmask.i
     - mail.bitmask.i
     - unstable.bitmask.i
   environments: 
-    bleeding: 
-      contact_emails: 
-        - sysdev@leap.se
     clientdev: 
       contact_emails: 
         - drebs@leap.se
@@ -383,9 +360,6 @@ nagios:
     disabled: 
       contact_emails: 
         - sysdev@leap.se
-    jessie: 
-      contact_emails: 
-        - sysdev@leap.se
     mail: 
       contact_emails: 
         - sysdev@leap.se
@@ -427,15 +401,6 @@ nagios:
         - soledad
         - webapp
       ssh_port: 22
-    armadillo: 
-      domain_full_suffix: bleeding.bitmask.net
-      domain_internal: armadillo.bleeding.bitmask.i
-      domain_internal_suffix: bleeding.bitmask.i
-      environment: bleeding
-      ip_address: "1.209.122.24"
-      services: 
-        - couchdb
-      ssh_port: 22
     cat: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: cat.unstable.bitmask.i
@@ -530,15 +495,6 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 22
-    gorilla: 
-      domain_full_suffix: bleeding.bitmask.net
-      domain_internal: gorilla.bleeding.bitmask.i
-      domain_internal_suffix: bleeding.bitmask.i
-      environment: bleeding
-      ip_address: "1.209.122.26"
-      services: 
-        - couchdb
-      ssh_port: 22
     hippo: 
       domain_full_suffix: bitmask.net
       domain_internal: hippo.bitmask.i
@@ -586,19 +542,6 @@ nagios:
       services: 
         - webapp
       ssh_port: 22
-    quetzal: 
-      domain_full_suffix: jessie.bitmask.net
-      domain_internal: quetzal.jessie.bitmask.i
-      domain_internal_suffix: jessie.bitmask.i
-      environment: jessie
-      ip_address: "199.119.112.197"
-      services: 
-        - couchdb
-        - mx
-        - pixelated
-        - soledad
-        - webapp
-      ssh_port: 22
     seahorse: 
       domain_full_suffix: bitmask.net
       domain_internal: seahorse.bitmask.i
diff --git a/nodes/armadillo.json b/nodes/armadillo.json
deleted file mode 100644
index ddb7e37..0000000
--- a/nodes/armadillo.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ip_address": "1.209.122.24",
-  "services": "couchdb",
-  "couch": {
-    "version": "2.0"
-  },
-  "tags": [
-    "bleeding", "seoul"
-  ],
-  "enabled": true 
-}
diff --git a/nodes/gorilla.json b/nodes/gorilla.json
deleted file mode 100644
index 218a9f3..0000000
--- a/nodes/gorilla.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ip_address": "1.209.122.26",
-  "services": "couchdb",
-  "couch": {
-    "version": "2.0"
-  },
-  "tags": [
-    "bleeding", "seoul"
-  ],
-  "enabled": true 
-}
diff --git a/nodes/quetzal.json b/nodes/quetzal.json
deleted file mode 100644
index b1423e2..0000000
--- a/nodes/quetzal.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "ip_address": "199.119.112.197",
-  "environment": "jessie",
-  "tags": ["jessie", "dc"],
-  "services": ["webapp", "couchdb", "mx", "soledad", "pixelated"],
-  "sources": {
-    "platform": {
-      "apt": {
-        "basic": "http://deb.leap.se/experimental-0.8"
-      }
-    }
-  },
-  "couch": {
-   "master": true,
-    "pwhash_alg": "pbkdf2"
-  }
-}
diff --git a/provider.bleeding.json b/provider.bleeding.json
deleted file mode 100644
index 3637e78..0000000
--- a/provider.bleeding.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "domain": "bleeding.bitmask.net",
-  "service": {
-    "allow_anonymous": false
-  }
-}
diff --git a/provider.jessie.json b/provider.jessie.json
deleted file mode 100644
index b84b1c4..0000000
--- a/provider.jessie.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "domain": "jessie.bitmask.net",
-  "service": {
-    "allow_anonymous": false
-  },
-  "platform": {
-    "branch": "develop"
-  }
-}
diff --git a/tags/bleeding.json b/tags/bleeding.json
deleted file mode 100644
index fc44a81..0000000
--- a/tags/bleeding.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "environment": "bleeding"
-}
diff --git a/tags/jessie.json b/tags/jessie.json
deleted file mode 100644
index af571e5..0000000
--- a/tags/jessie.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "environment": "jessie"
-}