diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
index 797a60556b..5675919164 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
@@ -5,5 +5,4 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/email-templates);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/streams,target:${installFolder}/../../../repository/resources/devicetypes/analytics/streams,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\
\ No newline at end of file
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml
deleted file mode 100644
index 074706d62d..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="org.wso2.iot.LocationStream" version="1.0.0" type="event/stream" serverRole="GeoDashboard">
-    <file>org.wso2.iot.LocationStream-1.0.0.json</file>
-</artifact>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json
deleted file mode 100644
index d275099901..0000000000
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "org.wso2.iot.LocationStream",
-    "version": "1.0.0",
-    "nickName": "",
-    "description": "IoT Server Location Stream",
-    "metaData": [
-        {
-            "name": "deviceId",
-            "type": "STRING"
-        },
-        {
-            "name": "deviceType",
-            "type": "STRING"
-        }
-    ],
-    "payloadData": [
-        {
-            "name": "timeStamp",
-            "type": "LONG"
-        },
-        {
-            "name": "latitude",
-            "type": "DOUBLE"
-        },
-        {
-            "name": "longitude",
-            "type": "DOUBLE"
-        }
-    ]
-}
\ No newline at end of file