diff --git a/.ssh/config.d/15_ec2 b/.ssh/config.d/15_ec2
deleted file mode 100644
index d23a1b56b6c1f3e4295431c811a1825208055c65..0000000000000000000000000000000000000000
--- a/.ssh/config.d/15_ec2
+++ /dev/null
@@ -1,5 +0,0 @@
-# Disable SSH host key checking for EC2 instances.
-
-Host  *.compute-1.amazonaws.com
-UserKnownHostsFile /dev/null
-StrictHostKeyChecking no
diff --git a/.ssh/config.d/20_bullguard b/.ssh/config.d/20_bullguard
index b967b500f0fc733fb8a94d5f0f4db9fbc6868723..726128401beb5e59dbaa91e92d2a384741f0e1fb 100644
--- a/.ssh/config.d/20_bullguard
+++ b/.ssh/config.d/20_bullguard
@@ -6,11 +6,9 @@ User git
 IdentityFile ~/.ssh/bullguard_ecdsa
 
 Host 172.50.1.11
-IdentityFile ~/.ssh/bullguard-prod_rsa
 User ec2-user
 
 Host 172.50.1.111
-IdentityFile ~/.ssh/bullguard-prod_rsa
 User ec2-user
 
 Host 172.50.*.*
diff --git a/.ssh/config.d/20_shore b/.ssh/config.d/20_shore
index c7547e3027bc01706e54f6cabdda38708066b4a3..26791d7bbe20f1694917c4f576004f1ba2103abe 100644
--- a/.ssh/config.d/20_shore
+++ b/.ssh/config.d/20_shore
@@ -1,53 +1,33 @@
 # shore.co.il infrastructure
 
 Host ns1.shore.co.il www.shore.co.il
-HostName ns1.shore.co.il
 LocalForward 9091 xbmc.shore.co.il:9091
 DynamicForward 8080
-User nimrod
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host xbmc.shore.co.il
-HostName xbmc.shore.co.il
-User nimrod
 ForwardX11 yes
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
 
 Host ns2.shore.co.il
-HostName ns2.shore.co.il
 User admin
 DynamicForward 9999
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host cgit.shore.co.il
-HostName cgit.shore.co.il
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
-User nimrod
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host ns3.shore.co.il
-HostName ns3.shore.co.il
 User root
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 DynamicForward 8081
 
 Host host01.shore.co.il
-HostName host01.shore.co.il
-User nimrod
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
-IdentityFile ~/.ssh/shore_ecdsa
-IdentityFile ~/.ssh/shore_rsa
 
 Host wdr4300.shore.co.il
-HostName wdr4300.shore.co.il
 User root
 ProxyCommand ssh ns1.shore.co.il -W %h:%p
+LocalForward 8082 localhost:80
+
+Host *.shore.co.il
 IdentityFile ~/.ssh/shore_ecdsa
 IdentityFile ~/.ssh/shore_rsa
-LocalForward 8082 localhost:80
+User nimrod