diff --git a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneRealTimeService.java b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneRealTimeService.java
index 5ae5cdc126..c70649511d 100644
--- a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneRealTimeService.java
+++ b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.api/src/main/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/service/DroneRealTimeService.java
@@ -21,13 +21,11 @@ package org.wso2.carbon.device.mgt.iot.droneanalyzer.service;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.iot.droneanalyzer.plugin.constants.DroneConstants;
 import org.wso2.carbon.device.mgt.iot.droneanalyzer.service.transport.DroneAnalyzerXMPPConnector;
-import org.wso2.carbon.device.mgt.iot.droneanalyzer.service.transport.DroneXMPPConnector;
 import org.wso2.carbon.device.mgt.iot.droneanalyzer.service.trasformer.MessageTransformer;
 
 import javax.websocket.*;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
-import java.nio.channels.ClosedChannelException;
 
 @ServerEndpoint("/datastream/drone_status")
 public class DroneRealTimeService {
@@ -42,6 +40,11 @@ public class DroneRealTimeService {
         xmppConnector.connectLoginAndSetFilterOnReceiver();
     }
 
+
+    /**
+     *
+     * @param session
+     */
     @OnOpen
     public void onOpen(Session session){
         log.info(session.getId() + " has opened a connection");
diff --git a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer/src/test/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDeviceDAOImplTest.java b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer/src/test/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDeviceDAOImplTest.java
deleted file mode 100644
index 32b36fe49b..0000000000
--- a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer/src/test/java/org/wso2/carbon/device/mgt/iot/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDeviceDAOImplTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.wso2.carbon.device.mgt.iot.droneanalyzer.plugin.impl.dao.impl;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.wso2.carbon.device.mgt.iot.util.iotdevice.dao.IotDeviceManagementDAOException;
-
-/**
- * Created by geesara on 12/9/15.
- */
-public class DroneAnalyzerDeviceDAOImplTest {
-    DroneAnalyzerDeviceDAOImpl dao;
-    @Before
-    public void init(){
-        dao = new DroneAnalyzerDeviceDAOImpl();
-    }
-
-    //@Test
-    public void testDBConnenction(){
-        try {
-            dao.deleteIotDevice("device1");
-        } catch (IotDeviceManagementDAOException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/pom.xml b/pom.xml
index a4cbec451a..e57d2e7dad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <!--<module>components/device-mgt-iot-arduino</module>-->
         <module>components/device-mgt-iot-digitaldisplay</module>
         <module>components/device-mgt-iot-droneanalyzer</module>
-        <!--<module>components/device-mgt-iot-raspberrypi</module>-->
+        <module>components/device-mgt-iot-raspberrypi</module>
         <module>components/device-mgt-iot-virtualfirealarm</module>
 
         <!--Core MDM and IoT Features-->
@@ -67,7 +67,7 @@
         <!--<module>features/device-mgt-iot-arduino-feature</module>-->
         <module>features/device-mgt-iot-digitaldisplay-feature</module>
         <module>features/device-mgt-iot-droneanalyzer-feature</module>
-        <!--<module>features/device-mgt-iot-raspberrypi-feature</module>-->
+        <module>features/device-mgt-iot-raspberrypi-feature</module>
         <module>features/device-mgt-iot-virtualfirealarm-feature</module>
     </modules>