Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 89)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 92)
@@ -11,5 +11,5 @@
  * @author nathaniellehrer
  */
-public class WitnessPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel
+public class WitnessPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
 {
 
@@ -25,9 +25,5 @@
     }
 
-    public void setRemoveListener(ActionListener listener)
-    {
-        removeListener = listener;
-    }
-
+    @Override
     public void getEventObject(I_ScriptEvent sei)
     {
@@ -119,4 +115,5 @@
     }
 
+    @Override
     public void update(Observable o, Object arg)
     {
@@ -142,5 +139,4 @@
     {
 
-        removeButton = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
         txtFirstName = new javax.swing.JTextField();
@@ -152,13 +148,4 @@
         txtPhoneNumber = new javax.swing.JFormattedTextField();
 
-        removeButton.setText("Remove");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
-                removeThisProperty(evt);
-            }
-        });
-
         jLabel1.setText("First Name");
 
@@ -178,5 +165,4 @@
                 .addContainerGap()
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(removeButton)
                     .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -198,7 +184,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(txtFirstName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -220,11 +204,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
-
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -233,5 +210,4 @@
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
-    private javax.swing.JButton removeButton;
     private javax.swing.JTextField txtAddress;
     private javax.swing.JTextField txtFirstName;