diff --git a/product/modules/distribution/src/repository/conf/cipher-tool.properties b/product/modules/distribution/src/repository/conf/cipher-tool.properties
deleted file mode 100644
index 2f0878a549..0000000000
--- a/product/modules/distribution/src/repository/conf/cipher-tool.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# This properties file contains all the aliases to be used in carbon components. If any property need to be secured, you need to add alias name and the value. This value is described as follows.
-# The value goes as, the file name//xpath to the property value to be secured,true if xml elements start with capital letter. Please check existing property values below.
-
-transports.https.keystorePass=mgt-transports.xml//transports/transport[@name='https']/parameter[@name='keystorePass'],false
-Carbon.Security.KeyStore.Password=carbon.xml//Server/Security/KeyStore/KeyPassword,true
-Carbon.Security.KeyStore.KeyPassword=carbon.xml//Server/Security/KeyStore/Password,true
-Carbon.Security.TrustStore.Password=carbon.xml//Server/Security/TrustStore/Password,true
-UserManager.AdminUser.Password=user-mgt.xml//UserManager/Realm/Configuration/AdminUser/Password,true
-Datasources.WSO2_CARBON_DB.Configuration.Password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2_CARBON_DB']/definition[@type='RDBMS']/configuration/password,false
-#Datasource.WSO2AM_DB.configuration.password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2AM_DB']/definition[@type='RDBMS']/configuration/password,false
-#Datasource.WSO2AM_STATS_DB.configuration.password=master-datasources.xml//datasources-configuration/datasources/datasource[name='WSO2AM_STATS_DB']/definition[@type='RDBMS']/configuration/password,false
-#UserStoreManager.Property.ConnectionPassword=user-mgt.xml//UserManager/Realm/UserStoreManager/Property[@name='ConnectionPassword'],true
-#UserStoreManager.Property.password=user-mgt.xml//UserManager/Realm/UserStoreManager/Property[@name='password'],true
-#AuthManager.Password=api-manager.xml//APIManager/AuthManager/Password,true
-#APIGateway.Password=api-manager.xml//APIManager/APIGateway/Environments/Environment/Password,true
-#APIUsageTracking.BAMPassword=api-manager.xml//APIManager/APIUsageTracking/BAMPassword,true
-#APIUsageTracking.JDBCPassword=api-manager.xml//APIManager/APIUsageTracking/JDBCPassword,true
-#APIKeyManager.Password=api-manager.xml//APIManager/APIKeyManager/Password,true
-#Database.Password=api-manager.xml//APIManager/Database/Password,true
-#Security.UserTrustedRPStore.Password=identity.xml//Server/Security/UserTrustedRPStore/Password
-#Security.UserTrustedRPStore.KeyPassword=identity.xml//Server/Security/UserTrustedRPStore/KeyPassword
-#Identity.System.StorePass=identity.xml//Server/Identity/System/StorePass
-#MultifactorAuthentication.XMPPSettings.XMPPConfig.XMPPPassword=identity.xml//MultifactorAuthentication/XMPPSettings/XMPPConfig/XMPPPassword
-#BPELEPR.Password=securedinvoke.epr//EndpointReference/Metadata/transport/authorization-password,false
-Axis2.Https.Listener.TrustStore.Password=axis2.xml//axisconfig/transportReceiver[@name='https']/parameter[@name='truststore']/TrustStore/Password,false
-Axis2.Https.Listener.KeyStore.Password=axis2.xml//axisconfig/transportReceiver[@name='https']/parameter[@name='keystore']/KeyStore/Password,false
-Axis2.Https.Listener.KeyStore.KeyPassword=axis2.xml//axisconfig/transportReceiver[@name='https']/parameter[@name='keystore']/KeyStore/KeyPassword,false
-Axis2.Https.Sender.TrustStore.Password=axis2.xml//axisconfig/transportSender[@name='https']/parameter[@name='truststore']/TrustStore/Password,false
-Axis2.Https.Sender.KeyStore.Password=axis2.xml//axisconfig/transportSender[@name='https']/parameter[@name='keystore']/KeyStore/Password,false
-Axis2.Https.Sender.KeyStore.KeyPassword=axis2.xml//axisconfig/transportSender[@name='https']/parameter[@name='keystore']/KeyStore/KeyPassword,false
-Axis2.Mailto.Parameter.Password=axis2.xml//axisconfig/transportSender[@name='mailto']/parameter[@name='mail.smtp.password'],false
-eventBrokerConfig.eventBroker.deliveryManager.remoteMessageBroker.password=event-broker.xml//eventBrokerConfig/eventBroker/deliveryManager/remoteMessageBroker/password,false
-
-
-
-
diff --git a/product/modules/distribution/src/repository/conf/wso2emm.jks b/product/modules/distribution/src/repository/conf/wso2emm.jks
deleted file mode 100644
index ab02772790..0000000000
Binary files a/product/modules/distribution/src/repository/conf/wso2emm.jks and /dev/null differ