--- a/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/ui/deployment/bluetooth/BluetoothTargetType.java	Wed Sep 01 16:59:08 2010 -0700
+++ b/plugins/org.symbian.tools.tmw.ui/src/org/symbian/tools/tmw/ui/deployment/bluetooth/BluetoothTargetType.java	Thu Sep 02 10:50:38 2010 -0700
@@ -19,7 +19,6 @@
 package org.symbian.tools.tmw.ui.deployment.bluetooth;
 
 import java.io.IOException;
-import java.io.PrintStream;
 import java.util.Collection;
 import java.util.Map;
 import java.util.TreeMap;
@@ -38,7 +37,6 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.symbian.tools.tmw.core.projects.ITMWProject;
-import org.symbian.tools.tmw.ui.ConsoleFactory;
 import org.symbian.tools.tmw.ui.TMWCoreUI;
 import org.symbian.tools.tmw.ui.deployment.IDeploymentTarget;
 import org.symbian.tools.tmw.ui.deployment.IDeploymentTargetType;
@@ -111,7 +109,6 @@
         }
     }
 
-    private static PrintStream savedSysOut;
     private boolean discovered = false;
     private TargetDiscoveryListener listener;
     private Map<String, BluetoothTarget> targets = new TreeMap<String, BluetoothTarget>();
@@ -139,7 +136,7 @@
             try {
                 started = LocalDevice.getLocalDevice().getDiscoveryAgent().startInquiry(DiscoveryAgent.GIAC, listener);
                 if (started) {
-                    inquiryCompletedEvent.wait();
+                    inquiryCompletedEvent.wait(BluetoothTarget.BLUETOOTH_TIMEOUT);
                     discovered = true;
                 }
             } catch (BluetoothStateException e) {
@@ -151,18 +148,6 @@
         monitor.done();
     }
 
-    /** Toggle BlueCove logging
-     */
-    public void enableBlueCoveDiagnostics(boolean enable) {
-        System.setProperty("bluecove.debug", Boolean.valueOf(enable).toString());
-        BlueCoveImpl.instance().enableNativeDebug(enable);
-        if (enable) {
-            System.setOut(new PrintStream(ConsoleFactory.createStream()));
-        } else {
-            System.setOut(savedSysOut);
-        }
-    }
-
     public IDeploymentTarget findTarget(ITMWProject project, String id) {
         if (!isBloothToothConnected()) {
             return null;