diff --git a/modules/core/distribution/src/assembly/filter.properties b/modules/core/distribution/src/assembly/filter.properties
index b915e955..308db67f 100644
--- a/modules/core/distribution/src/assembly/filter.properties
+++ b/modules/core/distribution/src/assembly/filter.properties
@@ -25,5 +25,4 @@ carbon.version=4.4.9
 default.server.role=IoTServer
 cep.server.role=ComplexEventProcessor
 das.server.role=DataAnalyticsServer
-emm.analytics.role=EMMAnalytics
 cdmf.analytics.role=CDMFAnalytics
\ No newline at end of file
diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules/core/distribution/src/repository/conf/carbon.xml
index d87f271e..fafaf53c 100644
--- a/modules/core/distribution/src/repository/conf/carbon.xml
+++ b/modules/core/distribution/src/repository/conf/carbon.xml
@@ -79,7 +79,6 @@
 		<Role>${default.server.role}</Role>
 		<Role>${das.server.role}</Role>
 		<Role>${cep.server.role}</Role>
-		<Role>${emm.analytics.role}</Role>
 		<Role>${cdmf.analytics.role}</Role>
 		<Role>IoTServer</Role>
 		<Role>CDMFPlatform</Role>
diff --git a/modules/core/distribution/src/repository/conf/identity/identity.xml b/modules/core/distribution/src/repository/conf/identity/identity.xml
index eb099596..b97ac1bb 100644
--- a/modules/core/distribution/src/repository/conf/identity/identity.xml
+++ b/modules/core/distribution/src/repository/conf/identity/identity.xml
@@ -240,7 +240,7 @@
 
         <!-- SAML Token validity period in minutes -->
         <SAMLResponseValidityPeriod>5</SAMLResponseValidityPeriod>
-        <UseAuthenticatedUserDomainCrypto>true</UseAuthenticatedUserDomainCrypto>
+        <UseAuthenticatedUserDomainCrypto>false</UseAuthenticatedUserDomainCrypto>
     </SSOService>
 
     <EntitlementSettings>
diff --git a/modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json b/modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
index 2978756e..13f9190b 100644
--- a/modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
+++ b/modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
@@ -19,8 +19,6 @@
         "passive" : "true",
         "signRequests" : "true",
         "assertionEncryptionEnabled" : "false"
-        //"acsURL" : "https://localhost:9443/api-store/jagg/jaggery_acs.jag", //In passive or request signing mode, use only if default Assertion Consumer Service URL needs to be overidden
-        //"nameIdPolicy" : "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", //If not specified, 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified' will be used
     },
     "oidcConfiguration" : {
       "enabled" : "false",
@@ -48,13 +46,10 @@
         "repliesPerPage" : "5",
         "resourceIdentifier" : "common"
     },
-
-
     "reverseProxy" : {
-        "enabled" : false,    // values true , false , "auto" - will look for  X-Forwarded-* headers
-        "host" : "sample.proxydomain.com", // If reverse proxy do not have a domain name use IP
+        "enabled" : false,
+        "host" : "sample.proxydomain.com",
         "context":""
-      //"regContext":"" // Use only if different path is used for registry
     },
   "mapExistingAuthApps" : false
 
diff --git a/pom.xml b/pom.xml
index d3561089..a8ce33c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1648,7 +1648,6 @@
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
         <carbon.dashboard.version>2.0.4-SNAPSHOT</carbon.dashboard.version>
-        <analytics.iots.version>1.0.0-SNAPSHOT</analytics.iots.version>
         <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>