diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index ac9bb9c6f8..f6f0a4897e 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -46,16 +46,6 @@ public class AndroidSenseService {
     private static final String LIGHT_STREAM_DEFINITION = "org.wso2.iot.devices.light";
     private static final String GPS_STREAM_DEFINITION = "org.wso2.iot.devices.gps";
     private static final String MAGNETIC_STREAM_DEFINITION = "org.wso2.iot.devices.magnetic";
-
-	/*Definetions for other sensor types.
-    * Accelerometer
-	* Gyroscope
-	* Pressure
-	* Proximity
-	* Gravity
-	* Rotation Vector
-	* */
-
     private static final String ACCELEROMETER_STREAM_DEFINITION = "org.wso2.iot.devices.accelerometer";
     private static final String GYROSCOPE_STREAM_DEFINITION = "org.wso2.iot.devices.gyroscope";
     private static final String PRESSURE_STREAM_DEFINITION = "org.wso2.iot.devices.pressure";
@@ -66,13 +56,11 @@ public class AndroidSenseService {
     private static final String SENSOR_ACCELEROMETER = "accelerometer";
     private static final String SENSOR_GYROSCOPE = "gyroscope";
     private static final String SENSOR_PRESSURE = "pressure";
-    private static final String SENSOR_GRVITY = "gravity";
+    private static final String SENSOR_GRAVITY = "gravity";
     private static final String SENSOR_ROTATION = "rotation";
     private static final String SENSOR_LIGHT = "light";
     private static final String SENSOR_GPS = "gps";
     private static final String SENSOR_PROXIMITY = "proximity";
-
-    /////////////////////////////////////////////////////////////////////////////////////////////
     private static final String SENSOR_BATTERY = "battery";
     private static final String SENSOR_MAGNETIC = "magnetic";
     private static Log log = LogFactory.getLog(AndroidSenseService.class);
@@ -297,7 +285,7 @@ public class AndroidSenseService {
                             gValuesF[0] = Float.parseFloat(valuesG[0]) * Float.parseFloat(valuesG[0]) * Float
                                     .parseFloat(valuesG[0]);
                             payloadData = gValuesF;
-                            sensorName = SENSOR_GRVITY;
+                            sensorName = SENSOR_GRAVITY;
                         } else if (androidSensorId == 11) {
                             streamDef = ROTATION_STREAM_DEFINITION;
                             String value = sensor.value;
@@ -416,11 +404,6 @@ public class AndroidSenseService {
         return sensorRecord;
     }
 
-    /**
-     * Created by Menaka
-     * Adding Accelerometer
-     */
-
     @Path("controller/readaccelerometer")
     @GET
     @Consumes("application/json")
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsene.apk b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsene.apk
new file mode 100644
index 0000000000..3f5405286e
Binary files /dev/null and b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsene.apk differ
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsense.apk b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsense.apk
deleted file mode 100644
index c329550b1a..0000000000
Binary files a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/agent/androidsense.apk and /dev/null differ
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/images/virtual_fire.png b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/images/virtual_fire.png
deleted file mode 100644
index dcaa711eea..0000000000
Binary files a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/images/virtual_fire.png and /dev/null differ
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/firealarm.png b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/firealarm.png
deleted file mode 100644
index a735a75ab6..0000000000
Binary files a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/firealarm.png and /dev/null differ
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/schematicsGuide.png b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/schematicsGuide.png
deleted file mode 100644
index b247bf65e2..0000000000
Binary files a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/schematicsGuide.png and /dev/null differ