diff --git a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
index 96235ee..fc5a437 100644
--- a/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
+++ b/src/main/java/de/mannheim/th/chess/ui/MainFrame.java
@@ -1,15 +1,11 @@
 package de.mannheim.th.chess.ui;
 
-import java.awt.EventQueue;
-
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
-import javax.swing.JTextField;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -20,10 +16,8 @@ import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Font;
-import java.awt.Graphics;
 import java.awt.Color;
 
 public class MainFrame extends JFrame {
@@ -33,22 +27,6 @@ public class MainFrame extends JFrame {
 	private static final long serialVersionUID = 1L;
 	private JPanel contentPane;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					MainFrame frame = new MainFrame();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
 	/**
 	 * Create the frame.
 	 */
diff --git a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
index 5e8220e..6fc32d8 100644
--- a/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
+++ b/src/main/java/de/mannheim/th/chess/ui/SpielFrame.java
@@ -35,12 +35,10 @@ public class SpielFrame extends JFrame {
   private static final Logger logger = LogManager.getLogger(App.class);
 
   private static final long serialVersionUID = 1L;
-  private JPanel contentPane;
   private ArrayList<JButton> buttons = new ArrayList<>();
   private HashMap<JButton, String> belegungen = new HashMap<>();
-  private JPanel panelLinks, panelRechts;
+  private JPanel panelLinks, panelRechts, contentPane;
   private Game game;
-  private String symbolChoosed;
 
   private BoardMode mode;
   private Square selectedSquare;
@@ -49,22 +47,6 @@ public class SpielFrame extends JFrame {
     normal, pieceSelected, finished
   }
 
-  /**
-   * Launch the application. Die Main-Methode für den WindowBuilder.
-   */
-  public static void main(String[] args) {
-    EventQueue.invokeLater(new Runnable() {
-      public void run() {
-        try {
-          SpielFrame frame = new SpielFrame();
-          frame.setVisible(true);
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
-      }
-    });
-  }
-
   /**
    * Create the frame.
    */
@@ -78,7 +60,7 @@ public class SpielFrame extends JFrame {
     setTitle("Schach");
     setAlwaysOnTop(true);
 
-    JPanel contentPane = new JPanel();
+    contentPane = new JPanel();
     contentPane.setLayout(new BorderLayout());
     setContentPane(contentPane);