diff --git a/framework/src/com/phonegap/api/PluginManager.java b/framework/src/com/phonegap/api/PluginManager.java
index a3d5d4d3..3edf68a6 100755
--- a/framework/src/com/phonegap/api/PluginManager.java
+++ b/framework/src/com/phonegap/api/PluginManager.java
@@ -6,10 +6,7 @@ import java.util.Map.Entry;
 import org.json.JSONArray;
 import org.json.JSONException;
 
-import android.content.Context;
-import android.content.Intent;
 import android.webkit.WebView;
-
 import com.phonegap.DroidGap;
 
 /**
@@ -65,7 +62,7 @@ public final class PluginManager {
 			final JSONArray args = new JSONArray(jsonArgs);
 			Class c = getClassByName(clazz);
 			if (isPhoneGapPlugin(c)) {
-				final Plugin plugin = this.addPlugin(clazz); //cmd; 
+				final Plugin plugin = this.addPlugin(clazz); 
 				final DroidGap ctx = this.ctx;
 				if (async) {
 					// Run this on a different thread so that this one can return back to JS
@@ -76,10 +73,8 @@ public final class PluginManager {
 							// Check the status for 0 (success) or otherwise
 							if (cr.getStatus() == 0) {
 								ctx.sendJavascript(cr.toSuccessCallbackString(callbackId));
-								//app.loadUrl(cr.toSuccessCallbackString(callbackId));
 							} else {
 								ctx.sendJavascript(cr.toErrorCallbackString(callbackId));
-								//app.loadUrl(cr.toErrorCallbackString(callbackId));
 							}
 						}
 					});
@@ -145,10 +140,10 @@ public final class PluginManager {
      * @return						The plugin
      */
 	public Plugin addPlugin(String className) {
-    	System.out.println("PluginManager.addPlugin("+className+")");
     	if (this.plugins.containsKey(className)) {
     		return this.getPlugin(className);
     	}
+    	System.out.println("PluginManager.addPlugin("+className+")");
     	try {
               Plugin plugin = (Plugin)Class.forName(className).newInstance();
               this.plugins.put(className, plugin);
@@ -212,18 +207,4 @@ public final class PluginManager {
     		plugin.onDestroy();
     	}
     }
-    
-
-    /**
-     * Send JavaScript statement back to JavaScript.
-     * 
-     * @param message
-     */
-    /*
-    public void sendJavascript(String statement) {
-    	//System.out.println("Module.sendResponse("+statement+")");
-    	this.ctx.callbackServer.sendJavascript(statement);
-    }
-    */
-
 }
\ No newline at end of file
diff --git a/framework/src/com/phonegap/api/PluginResult.java b/framework/src/com/phonegap/api/PluginResult.java
index 6d18ade5..fbfb281f 100755
--- a/framework/src/com/phonegap/api/PluginResult.java
+++ b/framework/src/com/phonegap/api/PluginResult.java
@@ -48,11 +48,11 @@ public class PluginResult {
 	}
 	
 	public String toSuccessCallbackString(String callbackId) {
-		return "javascript:PhoneGap.callbackSuccess('"+callbackId+"', " + this.getJSONString() + " );";
+		return "PhoneGap.callbackSuccess('"+callbackId+"', " + this.getJSONString() + " );";
 	}
 	
 	public String toErrorCallbackString(String callbackId) {
-		return "javascript:PhoneGap.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
+		return "PhoneGap.callbackError('"+callbackId+"', " + this.getJSONString()+ ");";
 	}
 	
 	public static String[] StatusMessages = new String[] {