diff --git a/src/schack/Pawn.java b/src/schack/Pawn.java
index bb3d0be..56b2e7b 100644
--- a/src/schack/Pawn.java
+++ b/src/schack/Pawn.java
@@ -3,6 +3,8 @@ package schack;
 import java.awt.Point;
 import java.io.IOException;
 import java.util.ArrayList;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 
 public class Pawn extends Piece {
 
@@ -74,7 +76,7 @@ public class Pawn extends Piece {
      * @param pieces
      */
     private ArrayList<Point> addAttackMovesIfCan(Point pos, Piece[][] pieces) {
-        ArrayList movable = new ArrayList<Point>();
+        ArrayList<Point> movable = new ArrayList();
         // Se till att vi inte är utanför brädet
         if (pos.x >= pieces.length || pos.x < 0 || pos.y >= pieces[0].length || pos.y < 0) {
             return movable;
diff --git a/src/schack/Schack.java b/src/schack/Schack.java
index 2710b05..eaaff8e 100644
--- a/src/schack/Schack.java
+++ b/src/schack/Schack.java
@@ -2,8 +2,6 @@ package schack;
 
 import java.awt.event.ActionEvent;
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
@@ -22,15 +20,8 @@ public class Schack {
     public Schack() throws IOException {
         // Set theme
         try {
-//            FlatSolarizedLightIJTheme.setup();
-//            FlatLightLaf.setup();
-            //embedMenuBarIfSupported();
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (Exception cantThemeWithFlatLaf) {
-            try {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            } catch (Exception cantThemeWithSystemLAF) {
-            }
+        } catch (Exception cantGetSystemTheme) {
         }
 
         frame = new JFrame();
@@ -46,24 +37,9 @@ public class Schack {
         // Create menu        
         final JMenuBar menuBar = new JMenuBar();
         final JMenu gameMenu = new JMenu("Game");
-        final JMenu connectMenu = new JMenu("Connect");
-        final JMenuItem connectToOpponent = new JMenuItem("Connect to opponent");
-        final JMenuItem showLocalIP = new JMenuItem("Show IP");
         final JMenuItem askForRemi = new JMenuItem("Ask for remi");
         final JMenuItem surrender = new JMenuItem("Surrender");
 
-        // Actions
-        connectToOpponent.addActionListener((ActionEvent ae) -> {
-            System.out.println("Connecting (TODO)");
-        });
-        showLocalIP.addActionListener((ActionEvent ae) -> {
-            try {
-                String localIp = InetAddress.getLocalHost().toString();
-                JOptionPane.showMessageDialog(frame, "Local IP: " + localIp);
-            } catch (UnknownHostException ex) {
-                JOptionPane.showMessageDialog(frame, "Could not get local IP");
-            }
-        });
         askForRemi.addActionListener((ActionEvent ae) -> {
             String whosWantingRemi = board.isWhitesTurn() ? "Vit" : "Svart";
             int choice = JOptionPane.showConfirmDialog(board, whosWantingRemi + " erbjuder remi\nAccepterar du?");
@@ -91,9 +67,6 @@ public class Schack {
         // Add the menu stuff
         frame.setJMenuBar(menuBar);
         menuBar.add(gameMenu);
-        menuBar.add(connectMenu);
-        connectMenu.add(connectToOpponent);
-        connectMenu.add(showLocalIP);
         gameMenu.add(askForRemi);
         gameMenu.add(surrender);
         frame.pack();
@@ -105,21 +78,4 @@ public class Schack {
     public static void main(String[] args) throws IOException {
         new Schack();
     }
-
-    private void embedMenuBarIfSupported() {
-        // Currently only supported in Windows 10+
-        String os = System.getProperty("os.name");
-        if (os.contains("Windows")) {
-            String versionNumberStr = os.split(" ")[1];
-            try {
-                int versionNumber = Integer.parseInt(versionNumberStr);
-                if (versionNumber >= 10) {
-                    System.setProperty("flatlaf.menuBarEmbedded", "true");
-                }
-            } catch (Exception e) {
-            }
-
-        }
-    }
-
 }