diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java b/core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
index 033dbb1e1..c770be0dc 100644
--- a/core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
+++ b/core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java
@@ -23,9 +23,6 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
@@ -50,6 +47,9 @@ import net.sf.openrocket.unit.Unit;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.MathUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class SimulationRunDialog extends JDialog {
 	private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class);
@@ -395,7 +395,6 @@ public class SimulationRunDialog extends JDialog {
 			log.debug("Simulation done");
 			setSimulationProgress(1.0);
 			updateProgress();
-			SimulationWarningDialog.showWarningDialog(SimulationRunDialog.this, simulation);
 		}
 		
 		
diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java b/core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java
index 659b6b429..201b4f22e 100644
--- a/core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java
+++ b/core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java
@@ -53,7 +53,6 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
 		
 		try {
 			simulation.simulate(listeners);
-			// FIXME - test for simulation warnings.
 		} catch (Throwable e) {
 			throwable = e;
 			return null;
@@ -87,7 +86,7 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
 	protected abstract void simulationInterrupted(Throwable t);
 	
 	
-
+	
 	/**
 	 * Marks this simulation as done and calls the progress update.
 	 */
@@ -100,7 +99,7 @@ public abstract class SimulationWorker extends SwingWorker<FlightData, Simulatio
 	}
 	
 	
-
+	
 	/**
 	 * A simulation listener that throws a {@link SimulationCancelledException} if
 	 * this SwingWorker has been cancelled.  The conditions is checked every time a step