diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 08a6f80e..6a216834 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -584,54 +584,6 @@
             </includes>
         </fileSet>
 
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/metrics</outputDirectory>
-            <includes>
-                <include>**/*.sql</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-
-        <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/mb-store
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/mb-store</outputDirectory>
-            <includes>
-                <include>**/*.*</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-
-        <!-- messaging related configs -->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
-            </outputDirectory>
-            <includes>
-                <include>**/broker.xml</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-
-        <!--QPID related configurations-->
-        <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
-            <includes>
-                <include>**/qpid-config.xml</include>
-                <include>**/qpid-virtualhosts.xml</include>
-                <include>**/qpid-jmxremote.access</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-
         <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
         <fileSet>
             <directory>
@@ -826,7 +778,9 @@
 
         <!-- Copying event-broker.xml -->
         <file>
-            <source>src/repository/conf/event-broker.xml</source>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
+            </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -940,30 +894,6 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--Metrics-->
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-
         <!-- nTask Component -->
         <file>
             <source>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 61c2e973..a05ea7f0 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -85,28 +85,6 @@
             </definition>
         </datasource>
 
-        <datasource>
-            <name>WSO2_MB_STORE_DB</name>
-            <description>The datasource used for message broker database</description>
-            <jndiConfig>
-                <name>WSO2MBStoreDB</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
-                    <username>wso2carbon</username>
-                    <password>wso2carbon</password>
-                    <driverClassName>org.h2.Driver</driverClassName>
-                    <maxActive>50</maxActive>
-                    <maxWait>60000</maxWait>
-                    <testOnBorrow>true</testOnBorrow>
-                    <validationQuery>SELECT 1</validationQuery>
-                    <validationInterval>30000</validationInterval>
-                    <defaultAutoCommit>false</defaultAutoCommit>
-                </configuration>
-            </definition>
-        </datasource>
-
         <!--<datasource>-->
         <!--<name>WSO2_IDENTITY_DB</name>-->
         <!--<description>The datasource used for Identity configurations</description>-->
diff --git a/modules/distribution/src/repository/conf/event-broker.xml b/modules/distribution/src/repository/conf/event-broker.xml
deleted file mode 100644
index 4487dc8e..00000000
--- a/modules/distribution/src/repository/conf/event-broker.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-This is the configuration file for the carbon event broker component. this configuration file configures the various subsystems of the event
-broker component and parameters.
--->
-<eventBrokerConfig xmlns="http://wso2.org/carbon/event/broker">
-    <eventBroker name="carbonEventBroker" class="org.wso2.carbon.andes.event.core.internal.CarbonEventBrokerFactory">
-
-        <!-- topic manager implementation class.-->
-        <topicManager name="TopicManager"
-                      class="org.wso2.carbon.andes.event.core.internal.subscription.registry.RegistryTopicManagerServiceFactory">
-            <!-- root node of the topic tree -->
-            <topicStoragePath>event/topics</topicStoragePath>
-        </topicManager>
-
-        <!-- subscription manager implementation. subscription manager persist the
-        subscriptions at the registry.  users can configure the topics root node and the topicIndex path -->
-        <subscriptionManager name="subscriptionManager"
-                             class="org.wso2.carbon.andes.event.core.internal.subscription.registry.RegistrySubscriptionManagerFactory">
-            <topicStoragePath>event/topics</topicStoragePath>
-            <indexStoragePath>event/topicIndex</indexStoragePath>
-        </subscriptionManager>
-
-        <!-- delivery manager implementation. delivery manager does actual delivery part of the event broker -->
-        <deliveryManager name="deliveryManager"
-                         class="org.wso2.carbon.andes.event.core.internal.delivery.jms.QpidJMSDeliveryManagerFactory"
-                         type="local">
-            <!--  <remoteMessageBroker>
-                 <hostName>localhost</hostName>
-                 <servicePort>9443</servicePort>
-                 <webContext>/</webContext>
-                 <userName>admin</userName>
-                 <password>admin</password>
-                 <qpidPort>5672</qpidPort>
-                 <clientID>clientID</clientID>
-                 <virtualHostName>carbon</virtualHostName>
-             </remoteMessageBroker> -->
-        </deliveryManager>
-
-        <!-- when publishing an event event broker uses a separate thread pool with an executor. following parameters configure different parameters of that -->
-        <eventPublisher>
-            <minSpareThreads>5</minSpareThreads>
-            <maxThreads>50</maxThreads>
-            <maxQueuedRequests>1000</maxQueuedRequests>
-            <keepAliveTime>1000</keepAliveTime>
-        </eventPublisher>
-    </eventBroker>
-</eventBrokerConfig>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 3cc53bed..6855ee8a 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -788,18 +788,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.messaging:org.wso2.carbon.andes.feature:${carbon.messaging.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.mb:org.wso2.mb.styles.feature:${product.mb.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.mb:org.wso2.stratos.mb.dashboard.ui.feature:${product.mb.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
-                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -897,6 +885,7 @@
                                     <id>org.wso2.mdm.mdmmgt.server.feature.group</id>
                                     <version>${carbon.mobile.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
                                     <version>${carbon.mobile.device.mgt.version}</version>
@@ -1674,22 +1663,6 @@
                                     <id>org.wso2.carbon.dashboards.portal.feature.group</id>
                                     <version>${carbon.dashboard.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.messaging.andes.feature.group</id>
-                                    <version>${carbon.messaging.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.mb.styles.feature.group</id>
-                                    <version>${product.mb.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.stratos.mb.dashboard.ui.feature.group</id>
-                                    <version>${product.mb.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.metrics.feature.group</id>
-                                    <version>${carbon.metrics.version}</version>
-                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 7f47228b..6df3b65f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1081,9 +1081,6 @@
         <carbon.analytics.version>1.0.4</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <carbon.dashboard.version>1.0.9</carbon.dashboard.version>
-        <carbon.messaging.version>3.0.1</carbon.messaging.version>
-        <product.mb.version>3.0.0</product.mb.version>
-        <carbon.metrics.version>1.1.1</carbon.metrics.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.event-processing.version>2.0.9</carbon.event-processing.version>
         <carbon.data.version>4.3.2</carbon.data.version>