diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java
index 9fbac51e..b8d1585f 100644
--- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java
+++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/Shimmer.java
@@ -682,7 +682,7 @@ public synchronized void connected(BluetoothSocket socket) {
 	/**
 	 * Stop all threads
 	 */
-	public synchronized void stop() {
+	public void stop() {
 		if (mTimerReadStatus!=null) {
 			mTimerReadStatus.cancel();
 			mTimerReadStatus.purge();
@@ -715,12 +715,7 @@ public synchronized void stop() {
 			mConnectThread = null;
 		}
 		if (mConnectedThread != null) {
-			try {
-				wait(200);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-			mConnectedThread.cancel(); 
+			mConnectedThread.cancel();
 			mConnectedThread = null;
 		}
 
diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/shimmerService/ShimmerService.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/shimmerService/ShimmerService.java
index ec4a59d3..0984e512 100644
--- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/shimmerService/ShimmerService.java
+++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/shimmerService/ShimmerService.java
@@ -553,6 +553,7 @@ public void handleMsgStateChange(Message msg) {
 					sendBroadcast(intent);
 					break;
 				case DISCONNECTED:
+					btManager.removeShimmerDeviceBtConnected(macAddress);
 					intent.putExtra("ShimmerBluetoothAddress", macAddress );
 					intent.putExtra("ShimmerDeviceName", shimmerName );
 					intent.putExtra("ShimmerState",BT_STATE.DISCONNECTED);