Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 89)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 92)
@@ -13,10 +13,9 @@
  * @author nathaniellehrer
  */
-public class CMSEvaluationPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel
+public class CMSEvaluationPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
 {
 
     private HashMap<String, Class> properties;
     private JTable dialogTable;
-    private ActionListener removeListener;
     private CMSEvaluationEvent event;
 
@@ -31,9 +30,4 @@
     }
 
-    public void setRemoveListener(ActionListener listener)
-    {
-        removeListener = listener;
-    }
-
     @Override
     public void getEventObject(I_ScriptEvent sei)
@@ -133,4 +127,5 @@
     }
 
+    @Override
     public void update(Observable o, Object arg)
     {
@@ -156,5 +151,4 @@
     {
 
-        removeButton = new javax.swing.JButton();
         jLabel3 = new javax.swing.JLabel();
         txtLocation = new javax.swing.JTextField();
@@ -167,14 +161,4 @@
         txtMessage = new javax.swing.JTextArea();
         addButton = new javax.swing.JButton();
-
-        removeButton.setText("Remove");
-        removeButton.setToolTipText("Removes this property");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
-                removeButtonremoveThisProperty(evt);
-            }
-        });
 
         jLabel3.setText("Location");
@@ -218,5 +202,4 @@
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                             .add(jScrollPane1)
-                            .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton)
                             .add(layout.createSequentialGroup()
                                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -234,7 +217,5 @@
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .add(17, 17, 17)
-                .add(removeButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(52, 52, 52)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel1)
@@ -257,11 +238,4 @@
         );
     }// </editor-fold>//GEN-END:initComponents
-
-    private void removeButtonremoveThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeButtonremoveThisProperty
-        if (removeListener != null)
-        {
-            removeListener.actionPerformed(new ActionEvent(this, 0, ""));
-        }
-}//GEN-LAST:event_removeButtonremoveThisProperty
 
 
@@ -274,5 +248,4 @@
     private javax.swing.JLabel jLabel3;
     private javax.swing.JScrollPane jScrollPane1;
-    private javax.swing.JButton removeButton;
     private javax.swing.JFormattedTextField txtID;
     private javax.swing.JTextField txtLocation;