diff --git a/.gitignore b/.gitignore
index ff04b28cf1..39e0c15d2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 *.class
 
+# VSCode
+.vscode/
+
 # Eclipse
 .classpath
 .settings
diff --git a/src/main/resources/alfresco/encryption-context.xml b/src/main/resources/alfresco/encryption-context.xml
index d1048874b5..fecdbf42e6 100644
--- a/src/main/resources/alfresco/encryption-context.xml
+++ b/src/main/resources/alfresco/encryption-context.xml
@@ -50,20 +50,6 @@
         <property name="trustStoreParameters" ref="sslTrustStoreParameters"/>
     </bean>
 
-    <bean id="ssl.keyStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
-       <property name="keyStoreParameters" ref="sslKeyStoreParameters"/>
-       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
-       <property name="validateKeyChanges" value="false"/>
-       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
-    </bean>
-
-    <bean id="ssl.trustStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
-       <property name="keyStoreParameters" ref="sslTrustStoreParameters"/>
-       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
-       <property name="validateKeyChanges" value="false"/>
-       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
-    </bean>
-
     <bean id="md5EncryptionParameters" class="org.alfresco.httpclient.MD5EncryptionParameters">
         <property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}"/>
         <property name="messageTimeout" value="${encryption.mac.messageTimeout}"/>
diff --git a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
deleted file mode 100644
index 3a32c534d6..0000000000
--- a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-aliases=ssl.alfresco.ca,ssl.repo
-# The ssl keystore password
-keystore.password=kT9X6oe68t
-# The password protecting the ssl repository key
-ssl.repo.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA key
-ssl.alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
deleted file mode 100644
index e5510fb03c..0000000000
--- a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-aliases=alfresco.ca
-# The ssl truststore password
-keystore.password=kT9X6oe68t
-# The password protecting the ssl Alfresco CA strust certificate
-alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl.keystore b/src/main/resources/alfresco/keystore/ssl.keystore
deleted file mode 100644
index 3491f92e3b..0000000000
Binary files a/src/main/resources/alfresco/keystore/ssl.keystore and /dev/null differ
diff --git a/src/main/resources/alfresco/keystore/ssl.truststore b/src/main/resources/alfresco/keystore/ssl.truststore
deleted file mode 100644
index 67273aff4f..0000000000
Binary files a/src/main/resources/alfresco/keystore/ssl.truststore and /dev/null differ