Index: trunk/src/event/editor/UnitPanel.java
===================================================================
--- trunk/src/event/editor/UnitPanel.java	(revision 89)
+++ trunk/src/event/editor/UnitPanel.java	(revision 92)
@@ -10,5 +10,5 @@
  * @author nathaniellehrer
  */
-public class UnitPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel
+public class UnitPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
 {
 
@@ -39,9 +39,5 @@
     }
 
-    public void setRemoveListener(ActionListener listener)
-    {
-        removeListener = listener;
-    }
-
+    @Override
     public void getEventObject(I_ScriptEvent sei)
     {
@@ -118,4 +114,5 @@
     }
 
+    @Override
     public void update(Observable o, Object arg)
     {
@@ -143,5 +140,4 @@
         jLabel1 = new javax.swing.JLabel();
         txtUnitNumber = new javax.swing.JFormattedTextField();
-        removeButton = new javax.swing.JButton();
         jLabel2 = new javax.swing.JLabel();
         StatusDropdown = new javax.swing.JComboBox();
@@ -157,13 +153,4 @@
         txtUnitNumber.setToolTipText("");
 
-        removeButton.setText("Remove");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
-                removeThisProperty(evt);
-            }
-        });
-
         jLabel2.setText("Status");
 
@@ -185,5 +172,4 @@
                 .addContainerGap()
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton)
                     .add(org.jdesktop.layout.GroupLayout.TRAILING, help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 565, Short.MAX_VALUE)
                     .add(layout.createSequentialGroup()
@@ -208,7 +194,5 @@
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .addContainerGap()
-                .add(removeButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                .add(47, 47, 47)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel1)
@@ -231,11 +215,4 @@
         );
     }// </editor-fold>//GEN-END:initComponents
-
-    private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty
-        if (removeListener != null)
-        {
-            removeListener.actionPerformed(new ActionEvent(this, 0, ""));
-        }
-    }//GEN-LAST:event_removeThisProperty
 
 
@@ -249,5 +226,4 @@
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
-    private javax.swing.JButton removeButton;
     private javax.swing.JFormattedTextField txtUnitNumber;
     // End of variables declaration//GEN-END:variables