diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 724539a0..3ec70f9c 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -161,37 +161,6 @@
 							</tasks>
 						</configuration>
 					</execution>
-					<execution>
-						<!-- Creating Social DB schema -->
-						<id>create-social-db-schema</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="########### Create Social Plugin H2 Schema ###########"/>
-
-								<property name="db.dir"
-										  value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
-								<property name="userid" value="wso2carbon"/>
-								<property name="password" value="wso2carbon"/>
-								<property name="dbURL"
-										  value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE"/>
-
-								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}"
-									 autocommit="true" onerror="continue">
-									<classpath refid="maven.dependency.classpath"/>
-									<classpath refid="maven.compile.classpath"/>
-									<classpath refid="maven.runtime.classpath"/>
-
-									<fileset
-											file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql"/>
-								</sql>
-								<echo message="##################### END ####################"/>
-							</tasks>
-						</configuration>
-					</execution>
 					<execution>
 						<id>3-extract-docs-from-components</id>
 						<phase>package</phase>
@@ -396,25 +365,6 @@ d                                        <exclude name="**/shindig.properties" /
 							</replacements>
 						</configuration>
 					</execution>
-
-					<execution>
-						<id>replace-for-api-publisher</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-						<configuration>
-							<file>
-								${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/site/conf/site.json
-							</file>
-							<replacements>
-								<replacement>
-									<token>(/publisher)</token>
-									<value>/api-publisher</value>
-								</replacement>
-							</replacements>
-						</configuration>
-					</execution>
 					<execution>
 						<id>replace-for-api-store</id>
 						<phase>prepare-package</phase>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 420c9152..181617b1 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -472,21 +472,7 @@
             </excludes>
         </fileSet>
 
-        <!-- Copying API Manager Publisher and Store Jaggery apps -->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher
-            </outputDirectory>
-            <excludes>
-                <exclude>publisherLogo/**</exclude>
-                <exclude>publisherTheme/**</exclude>
-                <exclude>publisherSite/**</exclude>
-                <exclude>footer/**</exclude>
-                <exclude>localstyles.css</exclude>
-            </excludes>
-        </fileSet>
+        <!-- Copying API Manager Store Jaggery app -->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/
@@ -951,15 +937,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying remote-appmanager-config.xml -->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!--certificate config file-->
         <file>
             <source>
@@ -1005,15 +982,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!--app management config file-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/app-manager.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!--License Config file-->
         <file>
             <source>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 3d08c07a..b0c7c2c5 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -443,48 +443,6 @@
                                 <!-- End of Mediation Features -->
 
                                 <!-- App Manager features-->
-
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
-
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.feature:${appmgt..feature.version}-->
-                                <!--</featureArtifactDef>-->
-
-                                <featureArtifactDef>
-                                    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}
-                                </featureArtifactDef>
-
-                                <featureArtifactDef>
-                                    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}
-                                </featureArtifactDef>
-
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
-
-                                <featureArtifactDef>
-                                    org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}
-                                </featureArtifactDef>
-
-                                <featureArtifactDef>
-                                    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.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -1234,50 +1192,6 @@
                                 </feature>
                                 <!-- End of Mediation Features -->
 
-                                <!-- App management features-->
-
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-
-                                <feature>
-                                    <id>org.wso2.carbon.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-
-
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.store.feature.group</id>
-                                    <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>
                                 <!-- Cipher tool feature -->
 
                                 <feature>