--- a/src/org/tn5250j/framework/tn5250/tnvt.java	Thu May 22 12:38:09 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/tnvt.java	Thu May 22 13:10:44 2014 -0700
@@ -79,7 +79,6 @@
 import java.util.concurrent.BlockingQueue;
 
 import javax.net.ssl.SSLSocket;
-import javax.swing.SwingUtilities;
 
 import org.tn5250j.Session5250;
 import org.tn5250j.TN5250jConstants;
@@ -287,16 +286,10 @@
 			this.port = port;
 
 			try {
-				SwingUtilities.invokeAndWait(new Runnable() {
-					public void run() {
-						screen52.getOIA().setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,
+				screen52.getOIA().setInputInhibited(ScreenOIA.INPUTINHIBITED_SYSTEM_WAIT,
 								ScreenOIA.OIA_LEVEL_INPUT_INHIBITED,"X - Connecting");
-					}
-				});
-
 			} catch (Exception exc) {
 				log.warn("setStatus(ON) " + exc.getMessage());
-
 			}
 
 			//         sock = new Socket(s, port);
@@ -341,13 +334,8 @@
 			pthread.start();
 
 			try {
-				SwingUtilities.invokeAndWait(new Runnable() {
-					public void run() {
-						screen52.getOIA().setInputInhibited(ScreenOIA.INPUTINHIBITED_NOTINHIBITED,
+				screen52.getOIA().setInputInhibited(ScreenOIA.INPUTINHIBITED_NOTINHIBITED,
 								ScreenOIA.OIA_LEVEL_INPUT_INHIBITED);
-					}
-				});
-
 			} catch (Exception exc) {
 				log.warn("setStatus(OFF) " + exc.getMessage());
 			}
@@ -1137,27 +1125,9 @@
 			if (screen52.isUsingGuiInterface())
 				screen52.drawFields();
 
-			//      if (screen52.screen[0][1].getChar() == '#' &&
-			//         screen52.screen[0][2].getChar() == '!')
-			//         execCmd();
-			//      else {
-
-			//			if (screen52.isHotSpots()) {
-			//				screen52.checkHotSpots();
-			//			}
-
 			try {
 				if (!strpccmd) {
-					//               SwingUtilities.invokeAndWait(
-					//                  new Runnable () {
-					//                     public void run() {
-					//                        screen52.updateDirty();
-					//                     }
-					//                  }
-					//               );
 					screen52.updateDirty();
-					//				controller.validate();
-					//				log.debug("update dirty");
 				} else {
 					strpccmd();
 				}