diff --git a/.ssh/config.d/20_endless b/.ssh/config.d/20_endless
index 068810dc5472b976c494584c9b5a0bc7698ade81..e10c91b873de44c9d4e359e91b3c93552d078cbf 100644
--- a/.ssh/config.d/20_endless
+++ b/.ssh/config.d/20_endless
@@ -21,8 +21,6 @@ Host 10.17.*.* *.dev.endlessm.com *.dev.endlessm-sf.com
 ProxyCommand ssh vpn-router.uw1.endlessm.com -W %h:%p
 
 Host 172.31.*.* 10.*.*.* *.endlessm-sf.com
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no
 ProxyCommand ssh openvpn.endlessm.com -W %h:%p
 
 Host 172.31.*.* 10.*.*.* *.endlessm.com *.endlessm-sf.com endlessm.com
diff --git a/.ssh/config.d/90_ec2 b/.ssh/config.d/90_ec2
deleted file mode 100644
index 2e3df2482433fb6c300f64a0dbac64cb7e521f76..0000000000000000000000000000000000000000
--- a/.ssh/config.d/90_ec2
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# vim:ft=sshconfig
-# Disable SSH host key checking for EC2 instances.
-
-Host  *.compute-1.amazonaws.com
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no