Index: trunk/src/event/editor/AudioPanel.java
===================================================================
--- trunk/src/event/editor/AudioPanel.java	(revision 89)
+++ trunk/src/event/editor/AudioPanel.java	(revision 92)
@@ -11,5 +11,5 @@
  * @author nathaniellehrer
  */
-public class AudioPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel
+public class AudioPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel
 {
 
@@ -26,9 +26,4 @@
     }
 
-    /**
-     * Load the script event associated with this editor panel.
-     *
-     * @param sei The script event in question
-     */
     @Override
     public void getEventObject(I_ScriptEvent sei)
@@ -85,9 +80,5 @@
     }
 
-    public void setRemoveListener(ActionListener listener)
-    {
-        removeListener = listener;
-    }
-
+    @Override
     public void update(Observable o, Object arg)
     {
@@ -113,5 +104,4 @@
     {
 
-        removeButton = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
         audioFileText = new javax.swing.JTextField();
@@ -119,21 +109,4 @@
         audioLengthText = new javax.swing.JFormattedTextField();
         browseButton = 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)
-            {
-                removeThisProperty(evt);
-            }
-        });
-        removeButton.addActionListener(new java.awt.event.ActionListener()
-        {
-            public void actionPerformed(java.awt.event.ActionEvent evt)
-            {
-                removeButtonActionPerformed(evt);
-            }
-        });
 
         jLabel1.setText("Audio File");
@@ -162,16 +135,13 @@
                 .addContainerGap()
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton)
+                    .add(jLabel1)
+                    .add(jLabel2))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(layout.createSequentialGroup()
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(jLabel1)
-                            .add(jLabel2))
+                        .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 395, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(layout.createSequentialGroup()
-                                .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 395, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                                .add(browseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 93, Short.MAX_VALUE))
-                            .add(audioLengthText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 497, Short.MAX_VALUE))))
+                        .add(browseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 93, Short.MAX_VALUE))
+                    .add(audioLengthText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 497, Short.MAX_VALUE))
                 .addContainerGap())
         );
@@ -179,7 +149,5 @@
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .addContainerGap()
-                .add(removeButton)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(41, 41, 41)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -193,15 +161,4 @@
         );
     }// </editor-fold>//GEN-END:initComponents
-
-    private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_removeButtonActionPerformed
-
-    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
 
     private void browse(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_browse
@@ -221,5 +178,4 @@
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
-    private javax.swing.JButton removeButton;
     // End of variables declaration//GEN-END:variables