Removed dotterel

12 files changed, 1 insertions, 383 deletions

diff --git a/files/nodes/dotterel/dotterel.crt b/files/nodes/dotterel/dotterel.crt
deleted file mode 100644
index 876e82a..0000000
--- a/files/nodes/dotterel/dotterel.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFtjCCA56gAwIBAgIRAKfGq6zJoaw50uE45WEa3D8wDQYJKoZIhvcNAQELBQAw
-SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE3MDQxODAwMDAwMFoXDTE4
-MDQxODAwMDAwMFowIzEhMB8GA1UEAwwYZG90dGVyZWwuZGV2LmJpdG1hc2submV0
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8TG3g0qf59br+a8WrFQq
-NICe5ekvifK5ocq6XRrXTsJ6op4/AKHQc8oBA3IlFiM8zBeed//rlCeRTGAc01QC
-mzKRi8DcXvXR78fqxzz1TcVwoDHSCQ4tmO8BEek83cKMvAISBL1bxS+cZ/vbppuq
-oiatvZu+DzPh3C9h2FEp5pz7IR2JReKmf3BEN5YP35bQCNtmiV3ER6JRmETB11kn
-qL+XX6cMlT8QErFlvrQxDMhELgyJ3kFYrS1ZC5lmm5qKF76j+YFHhtjH2wrQtHYS
-nAm2P7voW1s+R/3y0W2iy/44M9BKsO3qcqkvMuOUU+j8OUVrpLAnTup6cfQvFfQ9
-w6J3aHfRNje3tDKLb9sPO2LKzHiYZmqVQoYlcM0fJgQJIXvZXSfkXVibHlUxi8lP
-du9BYBIUC/xcWfvwxRk3HkaLPcdkcgvjTHTdiJU++fBi5BN+WduqXuCYYBmIjSXu
-D6PE0Orc6jDDxooBXYQy56nfNx6UQMIwz8sr+6qwKC6gHsDAaHj2yEFr6WBy7Tis
-/ZIMB9fsJ18wS6F2ozawE/KK4ip2RKIeLmDuAl8X/yZ6qlg+aIdE7RW7cv1h3DO6
-qGLFCQ31d6ltdO/gN0guTeWmaPyWnWudwEpvUSygx8i3WY2aWtY7PdcqSDl5F2HV
-Ho9oxRQsDXo+hX9D9riQ/h8CAwEAAaOBvTCBujAdBgNVHQ4EFgQUryoa2wmM1Pq3
-mvB4v3NQWvGkI2UwQQYDVR0RBDowOIIWZG90dGVyZWwuZGV2LmJpdG1hc2suaYIY
-ZG90dGVyZWwuZGV2LmJpdG1hc2submV0hwQl2vAyMAsGA1UdDwQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
-gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAdNn2O6D4
-x1A+kvL1PhJvV5fIuwKcFjf08H0Vhz/cMl1QQP3QkihAstJfqGsIZESRUSi/s7CZ
-lj98t2k/7Gzs1XGJfiZosarwNxjvyWsonaNLV3aDTuJtMbEbCBRaMIRal4VjTp7D
-iGve5Hlr5O2HoCT42waFl81b7RIOovZX2Sa0LJhLGuQuDser8Dw2liLpI1qNLdXo
-jgiRavYQSmcSIn2K7tou1mE/81att4Esab5VMZdElrzyc99UPSfG5JfwoYlhzMIf
-CyuW+ov/XB+Y1A4FJHcL47tHRcU0jeYjN634Rz2aHtSsnL61vf/HW/HVbgjEEOxd
-H8x2eh13j9Og6uSeNzwTN1NaIK5rsaP4zcQ5cXI1vsmFCOVH5kD6PvP+na5A8G85
-HP2/gqjjlgRT7Rr73bM1OzqeGIMK3YaTh4zPVDUWqsjsIZyqO6ToBnHRJ5uK/tud
-56DzB1t3Qg8H+SFink260QhIgfH2DJYWPIAopnLOAvu+c3lPPVH915AcqmK0YEZ6
-cF+RZmJVVmNuaZBCP4ogailTZf5JdLyLUrcguieA+iWVjbF6wb6xf5aByG5M/yh5
-rgDzLaMoumuTUUKjBHimDpTJZWSWTvtlXJx37Dl+aJVMkJLLJ3dEHg5FT/46LNs1
-08vfeV2LQFpui2rIeIwkqcQNPhna8HgH34M=
------END CERTIFICATE-----
diff --git a/files/nodes/dotterel/dotterel.key b/files/nodes/dotterel/dotterel.key
deleted file mode 100644
index a7e9036..0000000
--- a/files/nodes/dotterel/dotterel.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/files/nodes/dotterel/dotterel_ssh.pub b/files/nodes/dotterel/dotterel_ssh.pub
deleted file mode 100644
index 5dd9a3b..0000000
--- a/files/nodes/dotterel/dotterel_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 755d38f..c2a1a5c 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -10,7 +10,6 @@ clam,clam.dev.bitmask.i,clam.dev.bitmask.net,37.218.242.213 ssh-rsa AAAAB3NzaC1y
 demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx1qgYlN/Y69I0mn2NhjEw8RtSMw3XoQ79lushppGJlQse7lJx0fNyKc/xy/qxi0YSrgoXKm/gD4GaESqFglvIygDuNxiVyBDGUfCpPvmkp+q9eduBFL+UrIoLdsxpjx0hfLZfZ6YoXwGd44sK5pcn+5ov9h4HZCrjxDEAGr/Tg2hU+UXSV53136MZuGT4ylXZ3jIM6c6Pm9tBFSVH3TUuSmbzgCVTbvA2g6OqskMRACov0NrmADr8MfO6idRqIlZ/s8FmJOKtOjQMbQWq52PJ4yIEcaSUE0fmlERLnHVCrKfDojVOgXfeazHN9td2xojQTkT44rm/bqp1bx/QRss9
 diplocaulus,diplocaulus.bitmask.i,diplocaulus.bitmask.net,199.119.112.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpvETs31Zg2omqF9k3dq/CJDnZtrd+987VJgWex/zM/ZsRu7MYoAb34BBm2QroVwAiei5Wczn6CpdcYUuY38fdCxUVRKClm0abz0T6LT/EsqfY3N1d9OmAjN/XEWi/5+vnaiEuh313XUgD2vASFwLR+z9NHlGmz+uBaQLWRZF2Q36i2L7TOOxUG96i6knShNIGmaajVNhv078EtJlWbNzpEcVsn6CyRhyMdx0KzV2tIvitozwHcAy5UEQGGiwACxHwOS9IWn7UBHhfxf1kj1VVmnrewf6TnApvuqD8e0d9z+NnWOt9h3HAFxF92Ggs4FQ/vY7EcxgaEoW1kroGiNGP
 donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR
-dotterel,dotterel.dev.bitmask.i,dotterel.dev.bitmask.net,37.218.240.50 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
 elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,37.218.242.214 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
 giraffe,giraffe.cdev.bitmask.i,giraffe.cdev.bitmask.net,37.218.242.191 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCucBWeL3Konoolf/3RHuhMCSd+GL+1wM9pyH8TiHATKN7wGbjcN+TbSthLca4qW8h5AwQWtwX2Fz0rzp5m3jrHMDH9C2kZdtV0SSv3EkG8qA19QL3UlOHI/cR959CvGEqDVn8qrnfEhp866NHNZ0Oy+eqfdYbrAGxsTOFJYhlxeAcgtPwDnunEfVyycmjgijx8VlNzb0iLFEUAlK4+wKubabrm1ZgiVIvJrivZ2oUrOvplOlo9WPwdYDZCahjsWxTHIMFtPxaJMQsE0jzu/BnwvMztVyyfpYypB/IVFMY/onADExB2BDbTu0mFpHskd+pQSLQnm7Yrf6/Jg8e1FoGv
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 4c61d4a..0e07086 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -215,7 +215,6 @@ mynetworks:
   - "199.119.112.223"
   - "204.13.164.171"
   - "37.218.240.146"
-  - "37.218.240.50"
   - "37.218.242.145"
   - "37.218.242.146"
   - "37.218.242.191"
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 01dc989..4880e78 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -84,7 +84,6 @@ mynetworks:
   - "199.119.112.223"
   - "204.13.164.171"
   - "37.218.240.146"
-  - "37.218.240.50"
   - "37.218.242.145"
   - "37.218.242.146"
   - "37.218.242.191"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 3304373..b81e0a8 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -233,12 +233,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR"
     ip_address: "199.119.112.207"
     port: 22
-  dotterel: 
-    domain_full: dotterel.dev.bitmask.net
-    domain_internal: dotterel.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR"
-    ip_address: "37.218.240.50"
-    port: 22
   elephant: 
     aliases: 
       - api.dev.bitmask.net
@@ -435,15 +429,6 @@ nagios:
         - monitor
         - webapp
       ssh_port: 22
-    dotterel: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: dotterel.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.240.50"
-      services: 
-        - tor
-      ssh_port: 22
     elephant: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: elephant.dev.bitmask.i
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
deleted file mode 100644
index fa12fe2..0000000
--- a/hiera/dotterel.yaml
+++ /dev/null
@@ -1,265 +0,0 @@
---- 
-contacts: 
-  - sysdev@leap.se
-development: 
-  site_config: true
-dns: 
-  aliases: []
-  public: false
-domain: 
-  full: dotterel.dev.bitmask.net
-  full_suffix: dev.bitmask.net
-  internal: dotterel.dev.bitmask.i
-  internal_suffix: dev.bitmask.i
-  name: dotterel.dev.bitmask.i
-enabled: true
-environment: development
-firewall: 
-  ssh: 
-    from: sysadmin
-    port: 22
-    to: "37.218.240.50"
-  stunnel: []
-hosts: {}
-ip_address: "37.218.240.50"
-location: 
-  country_code: HK
-  hemisphere: "N"
-  name: "Hong Kong"
-  timezone: "+8"
-mail: 
-  smarthost: 
-    - snail.dev.bitmask.net
-name: dotterel
-platform: 
-  major_version: "0.10"
-  version: "0.10"
-service_type: internal_service
-services: 
-  - tor
-sources: 
-  apt: 
-    backports: "http://deb.debian.org/debian/"
-    basic: "http://deb.debian.org/debian/"
-    security: "http://security.debian.org/"
-  leap-mx: 
-    package: leap-mx
-    revision: latest
-    type: apt
-  nickserver: 
-    revision: origin/version/0.10
-    source: "https://leap.se/git/nickserver"
-    type: git
-  platform: 
-    apt: 
-      basic: "http://deb.leap.se/platform"
-      component: master
-  soledad: 
-    package: soledad-server
-    revision: latest
-    type: apt
-  webapp: 
-    revision: origin/version/0.9
-    source: "https://leap.se/git/leap_web"
-    type: git
-ssh: 
-  authorized_keys: 
-    azul: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w==
-      type: ssh-rsa
-    chiiph: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDAotYxNrKKXihZrDd39iKrXZSm3r8L9SNzhe9JG6cPaLTYuxhrS9QejYih9noboWfsVFmNPFYH42u3/vMyJEtf1WEUqQ84Qh2oQaC3orGMdpo3fXlCwlcp9q55gZTbSkpKwjn4pmg++wdTNjMmldi1ifPDl2uVt7dUkjQk8hy7CTJofkTxrXIzGZx+OI0knuos+lNV1uU3nJ6upbBwkvxwy3S9nfZ9kq7y5PBo0wK9YkOrKIAZtCnb0nobOiFMPeQDJdBWIo0btv5tCtzqe/b28TYz6DrMWrLIEJ+t8PH6QxaB0oLtlx5fImRxykLVHEe9AO1WcV0aXW4+6ZsHRG4X
-      type: ssh-rsa
-    cirunner: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ICt9oOuuuP7Rt1nIy1qcUV/xW7mDmCb0fcKkFDeAo+7UerEMcA+68oDNw+crc1nfoaW++lnDRIYnyJY43hX0P72u8mzIbt7YB0XgrQiofoygp5c72jQGbeV/59HoKiHI/PUsAG8Sy1oynBpzSd9OWi+h9dBdGq/Wisjdw1/0cILCmNZp0bKDnYfAgEUNmtxd6FFs+dx9x9hHBlquXYzOnMq0XBZiKvxdsnK1gFkNp34y3id7flXyOD5ecTNZJlhPwLTo2z22Re2GCqCh2og8tE58eIQXDeKNyyvmslgyJr2GxKpnjWOlNXW+SCX+bCx02GFuAiww5CcDWu1QuowL
-      type: ssh-rsa
-    db: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCZoVRqaxZL4Btmt7Nfcj0jNbM5UhBSFl37MWApS9qUlx1zJeH7Vw1ZRzUT8zLtdpOyL4JrF1jJ+D25/dqdTEv5dc7I/IcUz16uVD3REi9wk9uRo05DmG1PXQ0Pp3kRGhNFTh5e1ZeGbPlxZkHyUirWGz8A6hrPTUA/k+KRsQg4nH+3UTPzZcy3jvw6YvdATFNkZ5dhKyae9T41McBEdh5yPArfuVTL/ssckTxyISF5ObsvbzuuarTeNQQO5VpFvK9luKzXpta9IRHMeAHpu88MCiMcWiZUZlaVlD9tC6OcMNxCBWWMlNwtowgBmoIZnjo7NrMsJ1ksUT4eDsvf6huu9nX3KIigSUeuWPtaPMHCghhLXLQSuIOhQWXjFzl+KzgiOZ4ahmNMqiCaRFHAHw6BRuZRxphiMq2gjvKRg6a4giDIf9gkEQ6v+tiUQoGYXuwfb0sGVJfrnZVifUz+I1j0wWCBWaY7+/LtfaNIl1byyPzG+qRhHMUlj/IALnT4DuHM+VkXNyQ0fucGcyhFxabqfdxRUT0EQok8ib06f16JBCoqdd6bn64v1M29QGFeSF0t4zjqqDik7VQvOMph2WAZv9FwhvPrmbSSs3MIe7wVBaFC8zeavrZ8oCO1U40q2UcntO6Z0NpIhnGZC7zVxguEux1moAtWIE0+JIsrbu41gQ==
-      type: ssh-rsa
-    elijah: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDB6URGBMMAa5b15Kxb119vEoE+F+mxyEHzwZX1Bfqbc/UtYEhASOkYhjYSUAG1G7EY5ovHLqNC96NZqLALMB87/R9Wsgpo6Kg2qvs6zSSn1kWC+P3C/l1OHaQ3hVSYpeGUg1HoUi8zfMKreyYLvazIKMczvK7Vnx7mJKupLaZ5YJ78VyVhAM92ol8ztx1Mlsckgqvn/Zym+3bkUTkuxInoD3Ujht6hSI8KTa2yLpilgcGwMT+oJ2pWr5E3yhEz/ZBWLyjSw+aUUPEE8ZUJw3zn5PSUtD8mf0cNqzqomvk1HdGbHhRsCZa6yd3/xGsNrw5NUGFj5f/UmpSi9HoActRxMeW3ok/QBJg8p3Txdkpy00m7dLTzOnDfFIzXf7Bn9pD/e1wct/HaOmfH4IJ5Gj6UaWAnLPybWUAKT9q1xVMokMZDNWOvkT/79kKaHdsPh40nhuksCJ5oRw8CZLGs/MOtLyPF2aJG77Gih6LtjhRVq5PHiSwG6bd2Bguwg2jnjUKJ5vLjwwvV5X3xOya4AUcmyPlnvc/gRQty1J1tIyxTcvfJVNX/fZqEDsDZjnzQNaLfe5a6K0E3f+i4pwjfQraMLLT3KzyZtcgqDjN2+DY+HZwOib920Ihr+7xmQ1aRttzwMnVCTqHFN1NMBWEVANMX82gdbubM5Dub8q0eIfF78Q==
-      type: ssh-rsa
-    elijah2: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
-      type: ssh-rsa
-    ivan: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQD5Z5UfdPaAO0DywH/Hfl1Zm29YJ2SDGfofIRtLdbw06Ov3kG0mnURVC/G1L8IrphLMoRMFJR0f6AXr+XyFOW2xLTvBDfYeuZa26yyjzKAUVp+J+rdmmnJkJQzuF5/WimVsZ+d06omXyD/d9TP2qB2gd9+z/zYOIm7G5H8/9gnC045Hny3Kyd7xOzt24qbCq6pufskRYHp5V/ncgWp/osXE7vGGIxOLDLaaKikAHY4h6Uezh2KphA5a52RKy9jEzKKNW10ltmfg3s2WVjtYsGaEHTsZXs1YDE03uk7cqDsDy98udY9GLiUpz15LBemWVK4lCPG6BWzph0s8zMsEixSw2qAm6butsZE/E6EYNLeTL3eC3tWR/yxQxhdAkRIUAxR2yX/l+vTyMO8Z5ThZx2WWVAXo3zGtxKJUE0LhwD713zBNoT3GTbQKjCyWalAoCQ9QlZCdDhMVw9mVL5hUUY17IiSgvR0HTh66ySJYuM4NN67K+eZhz/aRAbCyG8Uj/M9TQ3td7ExzegUtYYPevWYy0cZf52zqvfz9GXEWJbF5MhJl2/0CZxsmdYPI43/BR9H62tKiC3cjOXYzFQYnRDri+2VHSCcR8gV6veKv/YwezEhc7LY/qc24yGQuXDWiSDjwsvYKrvPo3Uc6T2cTOyMzbW5tro2rD4LE1KYHU51Q6w==
-      type: ssh-rsa
-    jessie: 
-      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw==
-      type: ssh-rsa
-    kali: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
-      type: ssh-rsa
-    kwadronaut: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
-      type: ssh-rsa
-    meskio: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
-      type: ssh-rsa
-    micah: 
-      key: AAAAC3NzaC1lZDI1NTE5AAAAIFWPWdMWtDKPbcQBQnOytGcOX0Qt97yJuObDY9gI/22W
-      type: ssh-ed25519
-    micah2: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
-      type: ssh-rsa
-    monitor: 
-      key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFqCXlaYmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp76JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A==
-      type: ecdsa-sha2-nistp521
-    shyba: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
-      type: ssh-rsa
-    varac: 
-      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
-      type: ssh-rsa
-  config: 
-    AllowTcpForwarding: "no"
-  mosh: 
-    enabled: true
-    ports: "60000:61000"
-  port: 22
-stunnel: 
-  clients: {}
-  servers: {}
-tags: 
-  - development
-  - hongkong
-tor: 
-  bandwidth_rate: 100
-  contacts: 
-    - sysdev@leap.se
-  family: "dottereluSaR9IekHdQ,otterdVuPt9yFz8SpKm"
-  hidden_service: 
-    active: ~
-    address: ~
-    key_type: RSA
-    private_key: ~
-    public_key: ~
-    single_hop: false
-  nickname: dottereluSaR9IekHdQ
-  type: exit
-x509: 
-  ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
-      YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
-      Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
-      FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
-      BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-      ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
-      dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
-      7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
-      CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
-      znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
-      MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
-      lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
-      bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
-      DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
-      lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
-      YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
-      XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
-      MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
-      DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
-      cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
-      k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
-      RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
-      htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
-      EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
-      aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
-      mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
-      G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
-      Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
-      69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
-      yV8e
-      -----END CERTIFICATE-----
-  cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIFtjCCA56gAwIBAgIRAKfGq6zJoaw50uE45WEa3D8wDQYJKoZIhvcNAQELBQAw
-      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
-      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE3MDQxODAwMDAwMFoXDTE4
-      MDQxODAwMDAwMFowIzEhMB8GA1UEAwwYZG90dGVyZWwuZGV2LmJpdG1hc2submV0
-      MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8TG3g0qf59br+a8WrFQq
-      NICe5ekvifK5ocq6XRrXTsJ6op4/AKHQc8oBA3IlFiM8zBeed//rlCeRTGAc01QC
-      mzKRi8DcXvXR78fqxzz1TcVwoDHSCQ4tmO8BEek83cKMvAISBL1bxS+cZ/vbppuq
-      oiatvZu+DzPh3C9h2FEp5pz7IR2JReKmf3BEN5YP35bQCNtmiV3ER6JRmETB11kn
-      qL+XX6cMlT8QErFlvrQxDMhELgyJ3kFYrS1ZC5lmm5qKF76j+YFHhtjH2wrQtHYS
-      nAm2P7voW1s+R/3y0W2iy/44M9BKsO3qcqkvMuOUU+j8OUVrpLAnTup6cfQvFfQ9
-      w6J3aHfRNje3tDKLb9sPO2LKzHiYZmqVQoYlcM0fJgQJIXvZXSfkXVibHlUxi8lP
-      du9BYBIUC/xcWfvwxRk3HkaLPcdkcgvjTHTdiJU++fBi5BN+WduqXuCYYBmIjSXu
-      D6PE0Orc6jDDxooBXYQy56nfNx6UQMIwz8sr+6qwKC6gHsDAaHj2yEFr6WBy7Tis
-      /ZIMB9fsJ18wS6F2ozawE/KK4ip2RKIeLmDuAl8X/yZ6qlg+aIdE7RW7cv1h3DO6
-      qGLFCQ31d6ltdO/gN0guTeWmaPyWnWudwEpvUSygx8i3WY2aWtY7PdcqSDl5F2HV
-      Ho9oxRQsDXo+hX9D9riQ/h8CAwEAAaOBvTCBujAdBgNVHQ4EFgQUryoa2wmM1Pq3
-      mvB4v3NQWvGkI2UwQQYDVR0RBDowOIIWZG90dGVyZWwuZGV2LmJpdG1hc2suaYIY
-      ZG90dGVyZWwuZGV2LmJpdG1hc2submV0hwQl2vAyMAsGA1UdDwQEAwIFoDAdBgNV
-      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
-      gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAdNn2O6D4
-      x1A+kvL1PhJvV5fIuwKcFjf08H0Vhz/cMl1QQP3QkihAstJfqGsIZESRUSi/s7CZ
-      lj98t2k/7Gzs1XGJfiZosarwNxjvyWsonaNLV3aDTuJtMbEbCBRaMIRal4VjTp7D
-      iGve5Hlr5O2HoCT42waFl81b7RIOovZX2Sa0LJhLGuQuDser8Dw2liLpI1qNLdXo
-      jgiRavYQSmcSIn2K7tou1mE/81att4Esab5VMZdElrzyc99UPSfG5JfwoYlhzMIf
-      CyuW+ov/XB+Y1A4FJHcL47tHRcU0jeYjN634Rz2aHtSsnL61vf/HW/HVbgjEEOxd
-      H8x2eh13j9Og6uSeNzwTN1NaIK5rsaP4zcQ5cXI1vsmFCOVH5kD6PvP+na5A8G85
-      HP2/gqjjlgRT7Rr73bM1OzqeGIMK3YaTh4zPVDUWqsjsIZyqO6ToBnHRJ5uK/tud
-      56DzB1t3Qg8H+SFink260QhIgfH2DJYWPIAopnLOAvu+c3lPPVH915AcqmK0YEZ6
-      cF+RZmJVVmNuaZBCP4ogailTZf5JdLyLUrcguieA+iWVjbF6wb6xf5aByG5M/yh5
-      rgDzLaMoumuTUUKjBHimDpTJZWSWTvtlXJx37Dl+aJVMkJLLJ3dEHg5FT/46LNs1
-      08vfeV2LQFpui2rIeIwkqcQNPhna8HgH34M=
-      -----END CERTIFICATE-----
-  commercial_ca_cert: ~
-  commercial_cert: ~
-  commercial_key: ~
-  key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
-  use: true
-  use_commercial: false
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 92aaa31..e71e3f8 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -312,7 +312,6 @@ webapp:
   api_tokens: 
     allowed_ips: 
       - "204.13.164.171"
-      - "37.218.240.50"
       - "37.218.242.145"
       - "37.218.242.213"
       - "37.218.242.214"
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 15e96a8..910f011 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -161,7 +161,7 @@ tor:
   bandwidth_rate: 100
   contacts: 
     - sysdev@leap.se
-  family: "dottereluSaR9IekHdQ,otterdVuPt9yFz8SpKm"
+  family: otterdVuPt9yFz8SpKm
   hidden_service: 
     active: ~
     address: ~
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 4986540..c908fd7 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -90,7 +90,6 @@ mynetworks:
   - "199.119.112.223"
   - "204.13.164.171"
   - "37.218.240.146"
-  - "37.218.240.50"
   - "37.218.242.145"
   - "37.218.242.146"
   - "37.218.242.191"
diff --git a/nodes/dotterel.json b/nodes/dotterel.json
deleted file mode 100644
index f0a657d..0000000
--- a/nodes/dotterel.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "ip_address": "37.218.240.50",
-  "services": "tor",
-  "tags": [
-    "development",
-    "hongkong"
-  ],
-  "tor": {
-    "bandwidth_rate": 100,
-    "type": "exit"
-  }
-}