diff --git a/src/com/lushprojects/circuitjs1/client/AudioInputElm.java b/src/com/lushprojects/circuitjs1/client/AudioInputElm.java
index 645ccf07..c35442b5 100644
--- a/src/com/lushprojects/circuitjs1/client/AudioInputElm.java
+++ b/src/com/lushprojects/circuitjs1/client/AudioInputElm.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.FileUpload;
 
 class AudioFileEntry {
diff --git a/src/com/lushprojects/circuitjs1/client/CCVSElm.java b/src/com/lushprojects/circuitjs1/client/CCVSElm.java
index 87b72459..68d50178 100644
--- a/src/com/lushprojects/circuitjs1/client/CCVSElm.java
+++ b/src/com/lushprojects/circuitjs1/client/CCVSElm.java
@@ -21,8 +21,6 @@ package com.lushprojects.circuitjs1.client;
 
 import java.util.Vector;
 
-import com.lushprojects.circuitjs1.client.ChipElm.Pin;
-
 class CCVSElm extends VCCSElm {
     	static int FLAG_SPICE = 2;
     	VoltageElm voltageSources[];
diff --git a/src/com/lushprojects/circuitjs1/client/ChipElm.java b/src/com/lushprojects/circuitjs1/client/ChipElm.java
index 330c7327..5e95f972 100644
--- a/src/com/lushprojects/circuitjs1/client/ChipElm.java
+++ b/src/com/lushprojects/circuitjs1/client/ChipElm.java
@@ -260,7 +260,7 @@ abstract class ChipElm extends CircuitElm {
 		}
 	    }
 	    if (vsc != getVoltageSourceCount())
-		sim.console("voltage source count does not match number of outputs");
+		CirSim.console("voltage source count does not match number of outputs");
 	}
 	void execute() {}
 	void doStep() {
@@ -309,7 +309,7 @@ abstract class ChipElm extends CircuitElm {
 	
 	void writeOutput(int n, boolean value) {
 	    if (!pins[n].output)
-		sim.console("pin " + n + " is not an output!");
+		CirSim.console("pin " + n + " is not an output!");
 	    pins[n].value = value;
 	}
 	
diff --git a/src/com/lushprojects/circuitjs1/client/CirSim.java b/src/com/lushprojects/circuitjs1/client/CirSim.java
index 7d0ef202..8d61e3c5 100644
--- a/src/com/lushprojects/circuitjs1/client/CirSim.java
+++ b/src/com/lushprojects/circuitjs1/client/CirSim.java
@@ -31,11 +31,9 @@ import java.util.Map;
 import java.util.Random;
 import java.lang.Math;
 
-import com.gargoylesoftware.htmlunit.javascript.host.Console;
 import com.google.gwt.canvas.client.Canvas;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.CellPanel;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
@@ -57,7 +55,6 @@ import com.google.gwt.user.client.Event.NativePreviewEvent;
 import com.google.gwt.user.client.Event.NativePreviewHandler;
 import com.google.gwt.event.dom.client.MouseWheelEvent;
 import com.google.gwt.event.dom.client.MouseWheelHandler;
-import com.google.gwt.event.logical.shared.CloseEvent;
 import com.google.gwt.core.client.Callback;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
@@ -92,12 +89,10 @@ import com.google.gwt.storage.client.Storage;
 import com.google.gwt.user.client.ui.PopupPanel;
 import static com.google.gwt.event.dom.client.KeyCodes.*;
 import com.google.gwt.user.client.ui.Frame;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.Widget;
 import com.lushprojects.circuitjs1.client.util.PerfMonitor;
 import com.google.gwt.user.client.Window.ClosingEvent;
 import com.google.gwt.user.client.Window.Navigator;
-import com.google.gwt.event.logical.shared.CloseHandler;
 import com.google.gwt.event.logical.shared.ResizeEvent;
 import com.google.gwt.event.logical.shared.ResizeHandler;
 
diff --git a/src/com/lushprojects/circuitjs1/client/CustomCompositeElm.java b/src/com/lushprojects/circuitjs1/client/CustomCompositeElm.java
index 98dfde65..1f0de2ad 100644
--- a/src/com/lushprojects/circuitjs1/client/CustomCompositeElm.java
+++ b/src/com/lushprojects/circuitjs1/client/CustomCompositeElm.java
@@ -4,7 +4,6 @@ import java.util.Vector;
 
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
-import com.lushprojects.circuitjs1.client.ChipElm.Pin;
 
 // instances of subcircuits
 
@@ -218,7 +217,7 @@ public class CustomCompositeElm extends CompositeElm {
         }
         if (n == 5) {
             sim.readCircuit(model.modelCircuit);
-            sim.editDialog.closeDialog();
+            CirSim.editDialog.closeDialog();
         }
     }
     
diff --git a/src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java b/src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java
index d372f728..db3c87de 100644
--- a/src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java
+++ b/src/com/lushprojects/circuitjs1/client/CustomCompositeModel.java
@@ -7,8 +7,6 @@ import java.util.Map;
 import java.util.Vector;
 
 import com.google.gwt.storage.client.Storage;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.TextArea;
 
 // model for subcircuits
 
diff --git a/src/com/lushprojects/circuitjs1/client/CustomLogicElm.java b/src/com/lushprojects/circuitjs1/client/CustomLogicElm.java
index 7f1db879..9116ae09 100644
--- a/src/com/lushprojects/circuitjs1/client/CustomLogicElm.java
+++ b/src/com/lushprojects/circuitjs1/client/CustomLogicElm.java
@@ -1,7 +1,6 @@
 package com.lushprojects.circuitjs1.client;
 
 import com.google.gwt.user.client.ui.Button;
-import com.lushprojects.circuitjs1.client.ChipElm.Pin;
 
 public class CustomLogicElm extends ChipElm {
     String modelName;
diff --git a/src/com/lushprojects/circuitjs1/client/DCMotorElm.java b/src/com/lushprojects/circuitjs1/client/DCMotorElm.java
index 9607b95a..3d4ba6a9 100644
--- a/src/com/lushprojects/circuitjs1/client/DCMotorElm.java
+++ b/src/com/lushprojects/circuitjs1/client/DCMotorElm.java
@@ -191,7 +191,7 @@ class DCMotorElm extends CircuitElm {
 	getBasicInfo(arr);
 	arr[3] = sim.LS("speed") + " = " + getUnitText(60*Math.abs(speed)/(2*Math.PI), sim.LS("RPM"));
 	arr[4] = "L = " + getUnitText(inductance, "H");
-	arr[5] = "R = " + getUnitText(resistance, sim.ohmString);
+	arr[5] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	arr[6] = "P = " + getUnitText(getPower(), "W");
     }
     public EditInfo getEditInfo(int n) {
diff --git a/src/com/lushprojects/circuitjs1/client/DataInputElm.java b/src/com/lushprojects/circuitjs1/client/DataInputElm.java
index cba56f9d..e6f906a6 100644
--- a/src/com/lushprojects/circuitjs1/client/DataInputElm.java
+++ b/src/com/lushprojects/circuitjs1/client/DataInputElm.java
@@ -19,15 +19,11 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.core.client.JsArrayNumber;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.ui.FileUpload;
 
 class DataFileEntry {
@@ -183,7 +179,7 @@ class DataInputElm extends RailElm {
         	    double d = Double.parseDouble(arr[i]);
         	    data.add(d);
         	} catch (Exception e) {
-        	    sim.console("parse error on line " + i);
+        	    CirSim.console("parse error on line " + i);
         	}
             }
 	}
diff --git a/src/com/lushprojects/circuitjs1/client/DiacElm.java b/src/com/lushprojects/circuitjs1/client/DiacElm.java
index 08567ae3..74bd6647 100644
--- a/src/com/lushprojects/circuitjs1/client/DiacElm.java
+++ b/src/com/lushprojects/circuitjs1/client/DiacElm.java
@@ -129,8 +129,8 @@ class DiacElm extends CircuitElm {
 	arr[0] = "DIAC";
 	getBasicInfo(arr);
 	arr[3] = state ? "on" : "off";
-	arr[4] = "Ron = " + getUnitText(onresistance, sim.ohmString);
-	arr[5] = "Roff = " + getUnitText(offresistance, sim.ohmString);
+	arr[4] = "Ron = " + getUnitText(onresistance, CirSim.ohmString);
+	arr[5] = "Roff = " + getUnitText(offresistance, CirSim.ohmString);
 	arr[6] = "Vbrkdn = " + getUnitText(breakdown, "V");
 	arr[7] = "Ihold = " + getUnitText(holdcurrent, "A");
         arr[8] = "P = " + getUnitText(getPower(), "W");
diff --git a/src/com/lushprojects/circuitjs1/client/EditCompositeModelDialog.java b/src/com/lushprojects/circuitjs1/client/EditCompositeModelDialog.java
index 39962b51..54f17e8f 100644
--- a/src/com/lushprojects/circuitjs1/client/EditCompositeModelDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/EditCompositeModelDialog.java
@@ -23,10 +23,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.Window;
@@ -50,7 +46,6 @@ import com.google.gwt.canvas.dom.client.Context2d;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.i18n.client.DateTimeFormat;
 
 public class EditCompositeModelDialog extends Dialog implements MouseDownHandler, MouseMoveHandler, MouseUpHandler, MouseOutHandler, MouseOverHandler {
 	
@@ -244,9 +239,9 @@ public class EditCompositeModelDialog extends Dialog implements MouseDownHandler
 	    if (dx < 0 || dy < 0) {
 		for (int i = 0; i != postCount; i++) {
 		    Pin p = chip.pins[i];
-		    if (dx < 0 && (p.side == chip.SIDE_N || p.side == chip.SIDE_S) && p.pos >= chip.sizeX+dx)
+		    if (dx < 0 && (p.side == ChipElm.SIDE_N || p.side == ChipElm.SIDE_S) && p.pos >= chip.sizeX+dx)
 			return;
-		    if (dy < 0 && (p.side == chip.SIDE_E || p.side == chip.SIDE_W) && p.pos >= chip.sizeY+dy)
+		    if (dy < 0 && (p.side == ChipElm.SIDE_E || p.side == ChipElm.SIDE_W) && p.pos >= chip.sizeY+dy)
 			return;
 		}
 	    }
diff --git a/src/com/lushprojects/circuitjs1/client/EditDialog.java b/src/com/lushprojects/circuitjs1/client/EditDialog.java
index d7227760..75db31ee 100644
--- a/src/com/lushprojects/circuitjs1/client/EditDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/EditDialog.java
@@ -20,7 +20,6 @@
 package com.lushprojects.circuitjs1.client;
 
 
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.VerticalPanel;
@@ -312,10 +311,10 @@ class EditDialog extends Dialog {
 	public void closeDialog()
 	{
 		super.closeDialog();
-		if (cframe.editDialog == this)
-		    cframe.editDialog = null;
-		if (cframe.customLogicEditDialog == this)
-		    cframe.customLogicEditDialog = null;
+		if (CirSim.editDialog == this)
+		    CirSim.editDialog = null;
+		if (CirSim.customLogicEditDialog == this)
+		    CirSim.customLogicEditDialog = null;
 	}
 }
 
diff --git a/src/com/lushprojects/circuitjs1/client/EditInfo.java b/src/com/lushprojects/circuitjs1/client/EditInfo.java
index 24ffe0a6..47a8d2ff 100644
--- a/src/com/lushprojects/circuitjs1/client/EditInfo.java
+++ b/src/com/lushprojects/circuitjs1/client/EditInfo.java
@@ -20,7 +20,6 @@
 package com.lushprojects.circuitjs1.client;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.TextArea;
 
diff --git a/src/com/lushprojects/circuitjs1/client/ExportAsImageDialog.java b/src/com/lushprojects/circuitjs1/client/ExportAsImageDialog.java
index 1f9edad4..a7aae795 100644
--- a/src/com/lushprojects/circuitjs1/client/ExportAsImageDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ExportAsImageDialog.java
@@ -20,7 +20,6 @@
 package com.lushprojects.circuitjs1.client;
 
 import java.util.Date;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.VerticalPanel;
diff --git a/src/com/lushprojects/circuitjs1/client/ExportAsLocalFileDialog.java b/src/com/lushprojects/circuitjs1/client/ExportAsLocalFileDialog.java
index a8921c51..1e1ed513 100644
--- a/src/com/lushprojects/circuitjs1/client/ExportAsLocalFileDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ExportAsLocalFileDialog.java
@@ -20,7 +20,6 @@
 package com.lushprojects.circuitjs1.client;
 
 import java.util.Date;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Anchor;
diff --git a/src/com/lushprojects/circuitjs1/client/ExportAsTextDialog.java b/src/com/lushprojects/circuitjs1/client/ExportAsTextDialog.java
index 114c4380..1948672b 100644
--- a/src/com/lushprojects/circuitjs1/client/ExportAsTextDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ExportAsTextDialog.java
@@ -19,7 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.TextArea;
diff --git a/src/com/lushprojects/circuitjs1/client/ExportAsUrlDialog.java b/src/com/lushprojects/circuitjs1/client/ExportAsUrlDialog.java
index 569c7a11..0bdc851e 100644
--- a/src/com/lushprojects/circuitjs1/client/ExportAsUrlDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ExportAsUrlDialog.java
@@ -19,7 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.TextArea;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -31,7 +30,6 @@ import com.google.gwt.http.client.URL;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.RichTextArea;
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.http.client.RequestCallback;
 import com.google.gwt.http.client.RequestException;
diff --git a/src/com/lushprojects/circuitjs1/client/FuseElm.java b/src/com/lushprojects/circuitjs1/client/FuseElm.java
index a6dd69b1..89855226 100644
--- a/src/com/lushprojects/circuitjs1/client/FuseElm.java
+++ b/src/com/lushprojects/circuitjs1/client/FuseElm.java
@@ -146,7 +146,7 @@ class FuseElm extends CircuitElm {
 	void getInfo(String arr[]) {
 	    arr[0] = blown ? "fuse (blown)" : "fuse";
 	    getBasicInfo(arr);
-	    arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	    arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	    arr[4] = "I2t = " + i2t;
 	    if (!blown)
 		arr[5] = ((int)(heat*100/i2t)) + "% " + sim.LS("melted");
diff --git a/src/com/lushprojects/circuitjs1/client/ImportFromDropboxDialog.java b/src/com/lushprojects/circuitjs1/client/ImportFromDropboxDialog.java
index a85a8800..7500cda6 100644
--- a/src/com/lushprojects/circuitjs1/client/ImportFromDropboxDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ImportFromDropboxDialog.java
@@ -1,13 +1,8 @@
 package com.lushprojects.circuitjs1.client;
 
-import java.util.Date;
-
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextArea;
diff --git a/src/com/lushprojects/circuitjs1/client/ImportFromTextDialog.java b/src/com/lushprojects/circuitjs1/client/ImportFromTextDialog.java
index 0e57feca..55975b86 100644
--- a/src/com/lushprojects/circuitjs1/client/ImportFromTextDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ImportFromTextDialog.java
@@ -19,7 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.TextArea;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.VerticalPanel;
diff --git a/src/com/lushprojects/circuitjs1/client/LDRElm.java b/src/com/lushprojects/circuitjs1/client/LDRElm.java
index dda4414f..7af8fc1d 100644
--- a/src/com/lushprojects/circuitjs1/client/LDRElm.java
+++ b/src/com/lushprojects/circuitjs1/client/LDRElm.java
@@ -157,7 +157,7 @@ class LDRElm extends CircuitElm implements Command, MouseWheelHandler {
 	arr[0] = "photoresistor";
 	arr[1] = "I = "+ getCurrentDText(current); //getBasicInfo(arr);
 	arr[2] = "Vd = "+ getVoltageDText(getVoltageDiff());
-	arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	arr[4] = "P = " + getUnitText(getPower(), "W");
     }
     public EditInfo getEditInfo(int n) {
diff --git a/src/com/lushprojects/circuitjs1/client/LampElm.java b/src/com/lushprojects/circuitjs1/client/LampElm.java
index 3bfc777c..b0f86210 100644
--- a/src/com/lushprojects/circuitjs1/client/LampElm.java
+++ b/src/com/lushprojects/circuitjs1/client/LampElm.java
@@ -165,7 +165,7 @@ package com.lushprojects.circuitjs1.client;
 	void getInfo(String arr[]) {
 	    arr[0] = "lamp";
 	    getBasicInfo(arr);
-	    arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	    arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	    arr[4] = "P = " + getUnitText(getPower(), "W");
 	    arr[5] = "T = " + ((int) temp) + " K";
 	}
diff --git a/src/com/lushprojects/circuitjs1/client/MemristorElm.java b/src/com/lushprojects/circuitjs1/client/MemristorElm.java
index c32e2ac2..2dee96b2 100644
--- a/src/com/lushprojects/circuitjs1/client/MemristorElm.java
+++ b/src/com/lushprojects/circuitjs1/client/MemristorElm.java
@@ -116,7 +116,7 @@ class MemristorElm extends CircuitElm {
     void getInfo(String arr[]) {
 	arr[0] = "memristor";
 	getBasicInfo(arr);
-	arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	arr[4] = "P = " + getUnitText(getPower(), "W");
     }
     double getScopeValue(int x) {
diff --git a/src/com/lushprojects/circuitjs1/client/OhmMeterElm.java b/src/com/lushprojects/circuitjs1/client/OhmMeterElm.java
index 333375b8..51e7d6d7 100644
--- a/src/com/lushprojects/circuitjs1/client/OhmMeterElm.java
+++ b/src/com/lushprojects/circuitjs1/client/OhmMeterElm.java
@@ -21,12 +21,12 @@ public class OhmMeterElm extends CurrentElm {
 	    setPowerColor(g, false);
 	    
 	    drawThickCircle(g, center.x, center.y, cr);
-	    drawCenteredText(g, sim.ohmString, center.x, center.y, true);
+	    drawCenteredText(g, CirSim.ohmString, center.x, center.y, true);
 
 	    setBbox(point1, point2, cr);
 	    doDots(g);
 	    if (sim.showValuesCheckItem.getState() && current != 0) {
-		String s = getShortUnitText(getVoltageDiff()/current, sim.ohmString);
+		String s = getShortUnitText(getVoltageDiff()/current, CirSim.ohmString);
 		if (dx == 0 || dy == 0)
 		    drawValues(g, s, cr);
 	    }
@@ -57,6 +57,6 @@ public class OhmMeterElm extends CurrentElm {
 	    if (current == 0)
 		arr[1] = "R = \u221e";
 	    else
-		arr[1] = "R = " + getUnitText(getVoltageDiff()/current, sim.ohmString);
+		arr[1] = "R = " + getUnitText(getVoltageDiff()/current, CirSim.ohmString);
 	}
 }
diff --git a/src/com/lushprojects/circuitjs1/client/PotElm.java b/src/com/lushprojects/circuitjs1/client/PotElm.java
index 3fb621e2..ea95875c 100644
--- a/src/com/lushprojects/circuitjs1/client/PotElm.java
+++ b/src/com/lushprojects/circuitjs1/client/PotElm.java
@@ -255,7 +255,7 @@ class PotElm extends CircuitElm implements Command, MouseWheelHandler {
 	    dpx = 0;
 	    dpy = -hs;
 	}
-	sim.console("dv " + dpx + " " + w);
+	CirSim.console("dv " + dpx + " " + w);
 	if (dpx == 0)
 	    g.drawString(s, xc-w/2, yc-abs(dpy)-2);
 	else {
@@ -293,8 +293,8 @@ class PotElm extends CircuitElm implements Command, MouseWheelHandler {
     void getInfo(String arr[]) {
 	arr[0] = "potentiometer";
 	arr[1] = "Vd = " + getVoltageDText(getVoltageDiff());
-	arr[2] = "R1 = " + getUnitText(resistance1, sim.ohmString);
-	arr[3] = "R2 = " + getUnitText(resistance2, sim.ohmString);
+	arr[2] = "R1 = " + getUnitText(resistance1, CirSim.ohmString);
+	arr[3] = "R2 = " + getUnitText(resistance2, CirSim.ohmString);
 	arr[4] = "I1 = " + getCurrentDText(current1);
 	arr[5] = "I2 = " + getCurrentDText(current2);
     }
diff --git a/src/com/lushprojects/circuitjs1/client/QueryParameters.java b/src/com/lushprojects/circuitjs1/client/QueryParameters.java
index 320f6c0e..6114df1e 100644
--- a/src/com/lushprojects/circuitjs1/client/QueryParameters.java
+++ b/src/com/lushprojects/circuitjs1/client/QueryParameters.java
@@ -20,12 +20,11 @@
 package com.lushprojects.circuitjs1.client;
 
 import java.util.HashMap;
-import java.util.Map;
 import com.google.gwt.http.client.URL;
 
 public class QueryParameters
 {
-    private Map map = new HashMap();
+    private HashMap<String, String> map = new HashMap<String, String>();
 
     public QueryParameters()
     {
diff --git a/src/com/lushprojects/circuitjs1/client/ResistorElm.java b/src/com/lushprojects/circuitjs1/client/ResistorElm.java
index 0990bf92..8edff0ee 100644
--- a/src/com/lushprojects/circuitjs1/client/ResistorElm.java
+++ b/src/com/lushprojects/circuitjs1/client/ResistorElm.java
@@ -99,11 +99,11 @@ import com.google.gwt.canvas.dom.client.CanvasGradient;
 	void getInfo(String arr[]) {
 	    arr[0] = "resistor";
 	    getBasicInfo(arr);
-	    arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	    arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	    arr[4] = "P = " + getUnitText(getPower(), "W");
 	}
 	@Override String getScopeText(int v) {
-	    return sim.LS("resistor") + ", " + getUnitText(resistance, sim.ohmString);
+	    return sim.LS("resistor") + ", " + getUnitText(resistance, CirSim.ohmString);
 	}
 	public EditInfo getEditInfo(int n) {
 	    // ohmString doesn't work here on linux
diff --git a/src/com/lushprojects/circuitjs1/client/Scope.java b/src/com/lushprojects/circuitjs1/client/Scope.java
index 40ca14a0..668c7346 100644
--- a/src/com/lushprojects/circuitjs1/client/Scope.java
+++ b/src/com/lushprojects/circuitjs1/client/Scope.java
@@ -20,16 +20,13 @@
 package com.lushprojects.circuitjs1.client;
 
 import com.google.gwt.event.dom.client.MouseWheelEvent;
-import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.storage.client.Storage;
 
 
 import java.util.Vector;
 
-import com.gargoylesoftware.htmlunit.javascript.host.Console;
 import com.google.gwt.canvas.client.Canvas;
 import com.google.gwt.canvas.dom.client.Context2d;
-import com.google.gwt.core.client.GWT;
 
 // plot of single value on a scope
 class ScopePlot {
diff --git a/src/com/lushprojects/circuitjs1/client/ScopeElm.java b/src/com/lushprojects/circuitjs1/client/ScopeElm.java
index 9c65001c..0521a270 100644
--- a/src/com/lushprojects/circuitjs1/client/ScopeElm.java
+++ b/src/com/lushprojects/circuitjs1/client/ScopeElm.java
@@ -19,8 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import java.util.Vector;
-
 class ScopeElm extends CircuitElm {
     
     Scope elmScope;
@@ -101,7 +99,7 @@ class ScopeElm extends CircuitElm {
     void draw(Graphics g) {
 	g.setColor(needsHighlight() ? selectColor : whiteColor);
 	g.context.save();
-	g.context.setTransform(sim.devicePixelRatio(), 0, 0, sim.devicePixelRatio(), 0, 0);
+	g.context.setTransform(CirSim.devicePixelRatio(), 0, 0, CirSim.devicePixelRatio(), 0, 0);
 	setScopeRect();
 	elmScope.position = -1;
 	elmScope.draw(g);
diff --git a/src/com/lushprojects/circuitjs1/client/ScopePropertiesDialog.java b/src/com/lushprojects/circuitjs1/client/ScopePropertiesDialog.java
index 8c9b9dbf..cd0df56f 100644
--- a/src/com/lushprojects/circuitjs1/client/ScopePropertiesDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ScopePropertiesDialog.java
@@ -1,6 +1,5 @@
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.FontWeight;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -9,7 +8,6 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.FocusWidget;
 import com.google.gwt.user.client.ui.Grid;
diff --git a/src/com/lushprojects/circuitjs1/client/SearchDialog.java b/src/com/lushprojects/circuitjs1/client/SearchDialog.java
index d320c6a4..186da30f 100644
--- a/src/com/lushprojects/circuitjs1/client/SearchDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/SearchDialog.java
@@ -19,8 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.TextArea;
@@ -29,25 +27,16 @@ import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.DoubleClickEvent;
-import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyUpEvent;
 
 import java.util.Vector;
 import java.util.Collections;
 import java.util.Comparator;
 
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.KeyUpHandler;
-import com.google.gwt.event.dom.client.KeyDownHandler;
 import com.google.gwt.event.dom.client.DoubleClickHandler;
-import com.google.gwt.event.logical.shared.ValueChangeEvent;
-import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.ScrollPanel;
-import com.google.gwt.safehtml.shared.SafeHtml;
 
 public class SearchDialog extends Dialog {
 	
diff --git a/src/com/lushprojects/circuitjs1/client/ShortcutsDialog.java b/src/com/lushprojects/circuitjs1/client/ShortcutsDialog.java
index c52237b7..05334372 100644
--- a/src/com/lushprojects/circuitjs1/client/ShortcutsDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/ShortcutsDialog.java
@@ -19,7 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -34,9 +33,7 @@ import java.util.Vector;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ScrollPanel;
-import com.google.gwt.safehtml.shared.SafeHtml;
 
 public class ShortcutsDialog extends Dialog {
 	
diff --git a/src/com/lushprojects/circuitjs1/client/SliderDialog.java b/src/com/lushprojects/circuitjs1/client/SliderDialog.java
index 8e0a57f9..2e712e57 100644
--- a/src/com/lushprojects/circuitjs1/client/SliderDialog.java
+++ b/src/com/lushprojects/circuitjs1/client/SliderDialog.java
@@ -20,8 +20,6 @@
 package com.lushprojects.circuitjs1.client;
 
 
-import com.google.gwt.user.client.ui.DialogBox;
-import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -172,7 +170,7 @@ class SliderDialog extends Dialog  {
 //			continue;
 		    try {
 			adj.sliderText = ei.labelBox == null ? "" : ei.labelBox.getText();
-			sim.console("slidertext " + adj.sliderText + " " + ei.labelBox);
+			CirSim.console("slidertext " + adj.sliderText + " " + ei.labelBox);
 			if (adj.label != null)
 			    adj.label.setText(adj.sliderText);
 			double d = EditDialog.parseUnits(ei.minBox.getText());
@@ -180,7 +178,7 @@ class SliderDialog extends Dialog  {
 			d = EditDialog.parseUnits(ei.maxBox.getText());
 			adj.maxValue = d;
 			adj.setSliderValue(ei.value);
-		    } catch (Exception e) { sim.console(e.toString()); }
+		    } catch (Exception e) { CirSim.console(e.toString()); }
 		}
 	}
 
diff --git a/src/com/lushprojects/circuitjs1/client/SparkGapElm.java b/src/com/lushprojects/circuitjs1/client/SparkGapElm.java
index f5ea130a..92deee3b 100644
--- a/src/com/lushprojects/circuitjs1/client/SparkGapElm.java
+++ b/src/com/lushprojects/circuitjs1/client/SparkGapElm.java
@@ -103,8 +103,8 @@ class SparkGapElm extends CircuitElm {
 	arr[0] = "spark gap";
 	getBasicInfo(arr);
 	arr[3] = state ? "on" : "off";
-	arr[4] = "Ron = " + getUnitText(onresistance, sim.ohmString);
-	arr[5] = "Roff = " + getUnitText(offresistance, sim.ohmString);
+	arr[4] = "Ron = " + getUnitText(onresistance, CirSim.ohmString);
+	arr[5] = "Roff = " + getUnitText(offresistance, CirSim.ohmString);
 	arr[6] = "Vbreakdown = " + getUnitText(breakdown, "V");
     }
     public EditInfo getEditInfo(int n) {
diff --git a/src/com/lushprojects/circuitjs1/client/ThermistorNTCElm.java b/src/com/lushprojects/circuitjs1/client/ThermistorNTCElm.java
index b7691075..282a600c 100644
--- a/src/com/lushprojects/circuitjs1/client/ThermistorNTCElm.java
+++ b/src/com/lushprojects/circuitjs1/client/ThermistorNTCElm.java
@@ -173,7 +173,7 @@ class ThermistorNTCElm extends CircuitElm implements Command, MouseWheelHandler
 	arr[0] = "thermistor";
 	arr[1] = "I = "+ getCurrentDText(current); //getBasicInfo(arr);
 	arr[2] = "Vd = "+ getVoltageDText(getVoltageDiff());
-	arr[3] = "R = " + getUnitText(resistance, sim.ohmString);
+	arr[3] = "R = " + getUnitText(resistance, CirSim.ohmString);
 	arr[4] = "P = " + getUnitText(getPower(), "W");
 	arr[5] = "T = " + getUnitText(temperature, "\u00b0C");
     }
diff --git a/src/com/lushprojects/circuitjs1/client/TransLineElm.java b/src/com/lushprojects/circuitjs1/client/TransLineElm.java
index 15df01fe..1e8f2233 100644
--- a/src/com/lushprojects/circuitjs1/client/TransLineElm.java
+++ b/src/com/lushprojects/circuitjs1/client/TransLineElm.java
@@ -212,7 +212,7 @@ class TransLineElm extends CircuitElm {
     }
     void getInfo(String arr[]) {
 	arr[0] = "transmission line";
-	arr[1] = getUnitText(imped, sim.ohmString);
+	arr[1] = getUnitText(imped, CirSim.ohmString);
 	// use velocity factor for RG-58 cable (65%)
 	arr[2] = "length = " + getUnitText(.65*2.9979e8*delay, "m");
 	arr[3] = "delay = " + getUnitText(delay, "s");
diff --git a/src/com/lushprojects/circuitjs1/client/UnijunctionElm.java b/src/com/lushprojects/circuitjs1/client/UnijunctionElm.java
index 3eae53d3..3dae692e 100644
--- a/src/com/lushprojects/circuitjs1/client/UnijunctionElm.java
+++ b/src/com/lushprojects/circuitjs1/client/UnijunctionElm.java
@@ -19,11 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import java.util.Vector;
-
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-
 class UnijunctionElm extends CompositeElm {
 	// node 0 = E
 	// node 1 = B1
diff --git a/src/com/lushprojects/circuitjs1/client/VoltageElm.java b/src/com/lushprojects/circuitjs1/client/VoltageElm.java
index f2bd5aec..a3c4d7b3 100644
--- a/src/com/lushprojects/circuitjs1/client/VoltageElm.java
+++ b/src/com/lushprojects/circuitjs1/client/VoltageElm.java
@@ -294,7 +294,7 @@ class VoltageElm extends CircuitElm {
 		    getUnitText(2.9979e8/frequency, "m");
 	}
 	if (waveform == WF_DC && current != 0 && sim.showResistanceInVoltageSources)
-	    arr[i++] = "(R = " + getUnitText(maxVoltage/current, sim.ohmString) + ")";
+	    arr[i++] = "(R = " + getUnitText(maxVoltage/current, CirSim.ohmString) + ")";
 	arr[i++] = "P = " + getUnitText(getPower(), "W");
     }
     public EditInfo getEditInfo(int n) {
diff --git a/src/com/lushprojects/circuitjs1/client/ZenerElm.java b/src/com/lushprojects/circuitjs1/client/ZenerElm.java
index e4394806..2f2809ea 100644
--- a/src/com/lushprojects/circuitjs1/client/ZenerElm.java
+++ b/src/com/lushprojects/circuitjs1/client/ZenerElm.java
@@ -19,8 +19,6 @@
 
 package com.lushprojects.circuitjs1.client;
 
-import com.google.gwt.user.client.Window;
-
 // Zener code contributed by J. Mike Rollins
 // http://www.camotruck.net/rollins/simulator.html
 class ZenerElm extends DiodeElm {
diff --git a/src/com/lushprojects/circuitjs1/client/circuitjs1.java b/src/com/lushprojects/circuitjs1/client/circuitjs1.java
index d544ca1a..ce72d3c6 100644
--- a/src/com/lushprojects/circuitjs1/client/circuitjs1.java
+++ b/src/com/lushprojects/circuitjs1/client/circuitjs1.java
@@ -32,7 +32,6 @@ import com.google.gwt.http.client.RequestException;
 import com.google.gwt.http.client.Response;
 import com.google.gwt.storage.client.Storage;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.Window.ClosingEvent;
 
 public class circuitjs1 implements EntryPoint {