diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/ComponentAssemblyShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/ComponentAssemblyShapes.java
index c4b2cb960..da8250474 100644
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/ComponentAssemblyShapes.java
+++ b/swing/src/net/sf/openrocket/gui/rocketfigure/ComponentAssemblyShapes.java
@@ -1,5 +1,6 @@
 package net.sf.openrocket.gui.rocketfigure;
 
+import net.sf.openrocket.rocketcomponent.AxialStage;
 import net.sf.openrocket.rocketcomponent.ParallelStage;
 import net.sf.openrocket.rocketcomponent.PodSet;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -11,6 +12,11 @@ import java.awt.Shape;
 public class ComponentAssemblyShapes extends RocketComponentShape {
 
     public static RocketComponentShape[] getShapesSide(final RocketComponent component, final Transformation transformation) {
+        // Ignore normal stages
+        if (component instanceof AxialStage && !(component instanceof ParallelStage)) {
+            return null;
+        }
+
         double radius = getDisplayRadius(component);
 
         Shape[] s = EmptyShapes.getShapesSideWithSelectionSquare(transformation, radius);
@@ -26,6 +32,10 @@ public class ComponentAssemblyShapes extends RocketComponentShape {
     }
 
     public static RocketComponentShape[] getShapesBack(final RocketComponent component, final Transformation transformation) {
+        // Ignore normal stages
+        if (component instanceof AxialStage && !(component instanceof ParallelStage)) {
+            return null;
+        }
         double radius = getDisplayRadius(component);
 
         Shape[] s = EmptyShapes.getShapesBackWithSelectionSquare(transformation, radius);
diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/ParallelStageShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/ParallelStageShapes.java
deleted file mode 100644
index 18f27ab4a..000000000
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/ParallelStageShapes.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.sf.openrocket.gui.rocketfigure;
-
-public class ParallelStageShapes extends ComponentAssemblyShapes {
-    // Everything is implemented in ComponentAssemblyShapes.java
-}
diff --git a/swing/src/net/sf/openrocket/gui/rocketfigure/PodSetShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/PodSetShapes.java
deleted file mode 100644
index 1d2ba4144..000000000
--- a/swing/src/net/sf/openrocket/gui/rocketfigure/PodSetShapes.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package net.sf.openrocket.gui.rocketfigure;
-
-public class PodSetShapes extends ComponentAssemblyShapes {
-    // Everything is implemented in ComponentAssemblyShapes.java
-}