Index: trunk/src/event/editor/CCTVPanel.java
===================================================================
--- trunk/src/event/editor/CCTVPanel.java	(revision 89)
+++ trunk/src/event/editor/CCTVPanel.java	(revision 92)
@@ -10,8 +10,7 @@
  * @author nathaniellehrer
  */
-public class CCTVPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel
+public class CCTVPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
 {
 
-    private ActionListener removeListener;
     private CCTVEvent event;
 
@@ -55,10 +54,4 @@
 
     @Override
-    public void setRemoveListener(ActionListener listener)
-    {
-        removeListener = listener;
-    }
-
-    @Override
     public void getEventObject(I_ScriptEvent sei)
     {
@@ -94,5 +87,4 @@
     {
 
-        removeButton = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
         txtDirField = new javax.swing.JFormattedTextField();
@@ -102,20 +94,4 @@
         txtToggleField = new javax.swing.JFormattedTextField();
         help = new javax.swing.JLabel();
-
-        removeButton.setText("Remove");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
-        {
-            public void mouseClicked(java.awt.event.MouseEvent evt)
-            {
-                removeButtonremoveThisProperty(evt);
-            }
-        });
-        removeButton.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                removeButtonActionPerformed(evt);
-            }
-        });
 
         jLabel1.setText("ID");
@@ -137,5 +113,4 @@
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(org.jdesktop.layout.GroupLayout.TRAILING, help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 540, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton)
                     .add(layout.createSequentialGroup()
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -153,7 +128,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)
@@ -173,15 +146,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
-
-    private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
-        // TODO add your handling code here:
-}//GEN-LAST:event_removeButtonActionPerformed
-
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -190,5 +152,4 @@
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
-    private javax.swing.JButton removeButton;
     private javax.swing.JFormattedTextField txtDirField;
     private javax.swing.JTextField txtIDField;