diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index ff03f0d9..3e415d78 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -388,6 +388,9 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
             </outputDirectory>
+            <excludes>
+                <exclude>appmoauth2.war</exclude>
+            </excludes>
             <filtered>false</filtered>
             <fileMode>644</fileMode>
         </fileSet>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 43e467a1..8b2bfe74 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -439,7 +439,7 @@
                                 <!-- App Manager features-->
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <!--<featureArtifactDef>-->
@@ -447,23 +447,23 @@
                                 <!--</featureArtifactDef>-->
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
@@ -471,12 +471,12 @@
                                 </featureArtifactDef>
 
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt..feature.version}
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
-                                <featureArtifactDef>
-                                    org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}-->
+                                <!--</featureArtifactDef>-->
 
 
                                 <featureArtifactDef>
@@ -1218,11 +1218,12 @@
 
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
+
                                 <!--<feature>-->
                                 <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
-                                <!--<version>${appmgt..feature.version}</version>-->
+                                <!--<version>${appmgt.feature.version}</version>-->
                                 <!--</feature>-->
 
 
@@ -1233,37 +1234,37 @@
 
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
 
 
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.store.feature.group</id>
-                                    <version>${appmgt..feature.version}</version>
+                                    <version>${appmgt.feature.version}</version>
                                 </feature>
 
                                 <!-- End of app management features-->
 
-                                <feature>
-                                    <id>org.wso2.carbon.social.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.social.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
                                 <!-- Cipher tool feature -->
 
                                 <feature>
diff --git a/pom.xml b/pom.xml
index af2420f8..4f147aab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -909,49 +909,49 @@
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.core.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
                 <artifactId>org.wso2.carbon.appmgt.store.feature</artifactId>
-                <version>${appmgt..feature.version}</version>
+                <version>${appmgt.feature.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.appmgt</groupId>
@@ -1103,7 +1103,7 @@
         <google.gson.version>2.3.1</google.gson.version>
 
         <!-- App manager version-->
-        <appmgt..feature.version>1.1.1</appmgt..feature.version>
+        <appmgt.feature.version>1.1.1</appmgt.feature.version>
         <carbon.appmgt.version>1.1.1</carbon.appmgt.version>
 
         <!-- Carbon Store version-->