diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index ba5715903..ba1c54686 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -27,7 +27,7 @@ import net.sf.openrocket.util.StateChangeListener;
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
  * @author Daniel Williams <equipoise@gmail.com>
  */
-public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, ChangeSource, ComponentChangeListener, Monitorable {
+public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, Monitorable {
 	private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class);
 	
 	public final static String DEFAULT_CONFIGURATION_NAME = "Default Configuration";
@@ -269,14 +269,6 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	
 	////////////////  Listeners  ////////////////
 	
-	@Override
-	public void addChangeListener(StateChangeListener listener) {
-	}
-	
-	@Override
-	public void removeChangeListener(StateChangeListener listener) {
-	}
-	
 	// for outgoing events only
 	protected void fireChangeEvent() {
 		this.modID++;
@@ -353,13 +345,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 		return this.getName();
 	}
 
-	@Override
-	public void componentChanged(ComponentChangeEvent cce) {
-		// update according to incoming events 
-		updateStages();
-		updateMotors();
-	}
-	
+
 	/**
 	 * Add a motor instance to this configuration.  
 	 * 
diff --git a/swing/src/net/sf/openrocket/gui/components/StageSelector.java b/swing/src/net/sf/openrocket/gui/components/StageSelector.java
index affab5258..1840fe41f 100644
--- a/swing/src/net/sf/openrocket/gui/components/StageSelector.java
+++ b/swing/src/net/sf/openrocket/gui/components/StageSelector.java
@@ -32,7 +32,6 @@ public class StageSelector extends JPanel implements StateChangeListener {
 		
 		updateButtons();
 		
-		configuration.addChangeListener(this);
 	}
 	
 	private void updateButtons() {
@@ -65,7 +64,6 @@ public class StageSelector extends JPanel implements StateChangeListener {
 		
 		public StageAction(final int stage) {
 			this.stageNumber = stage;
-			configuration.addChangeListener(this);
 			stateChanged(null);
 		}
 		
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index 7482cfd60..580d6665a 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -401,7 +401,6 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 		theta.addChangeListener(this);
 		aoa.addChangeListener(this);
 		roll.addChangeListener(this);
-		configuration.addChangeListener(this);
 		this.stateChanged(null);
 		
 		
@@ -415,7 +414,6 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 				aoa.removeChangeListener(ComponentAnalysisDialog.this);
 				mach.removeChangeListener(ComponentAnalysisDialog.this);
 				roll.removeChangeListener(ComponentAnalysisDialog.this);
-				configuration.removeChangeListener(ComponentAnalysisDialog.this);
 				//System.out.println("SETTING NAN VALUES");
 				rocketPanel.setCPAOA(Double.NaN);
 				rocketPanel.setCPTheta(Double.NaN);
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
index 7f1b6504c..9a7abd7f7 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -43,12 +43,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 		this.flightConfigurationPanel = flightConfigurationPanel;
 		this.rocket = rocket;
 		table = initializeTable();
-		rocket.getSelectedConfiguration().addChangeListener( new StateChangeListener() {
-			@Override
-			public void stateChanged(EventObject e) {
-				FlightConfigurablePanel.this.synchronizeConfigurationSelection();
-			}
-		});
+
 		installTableListener();
 		synchronizeConfigurationSelection();
 	}
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
index fdaafc708..6412f4910 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurationPanel.java
@@ -118,8 +118,6 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 
 		this.add(tabs, "spanx, grow, wrap rel");
 
-		
-		this.rocket.getSelectedConfiguration().addChangeListener(this);
 	}
 	
 	private void addConfiguration() {
@@ -146,7 +144,6 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 			}
 		}
 		rocket.setFlightConfiguration(newId, newConfig);
-		rocket.addComponentChangeListener( newConfig);
 		
 		// Create a new simulation for this configuration.
 		createSimulationForNewConfiguration();