--- jabref-2.1.orig/src/java/net/sf/jabref/JabRef.java
+++ jabref-2.1/src/java/net/sf/jabref/JabRef.java
@@ -43,7 +43,6 @@
 
 import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
 import com.jgoodies.looks.FontSet;
 import com.jgoodies.looks.FontSets;
 import com.jgoodies.looks.FontPolicy;
@@ -624,27 +623,6 @@
 
                     //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
                 }
-                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
-
-                    // Set a "model" icon size, so menu items are evenly spaced even though
-                    // only some items have icons. We load an arbitrary icon and look at
-                    // its size to determine what size to use:
-                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
-                    com.jgoodies.looks.Options.setDefaultIconSize
-                        (new Dimension(defaultIconSize, defaultIconSize));
-
-                    if (overrideDefaultFonts) {
-                        FontSet fontSet = FontSets.createDefaultFontSet(
-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
-                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
-                            );
-                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
-                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
-                    }
-                    
-                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
-                }
 
                 if (lnf != null) {
                     try {
only in patch2:
unchanged:
--- jabref-2.1.orig/src/java/net/sf/jabref/export/VerifyingWriter.java
+++ jabref-2.1/src/java/net/sf/jabref/export/VerifyingWriter.java
@@ -1,7 +1,5 @@
 package net.sf.jabref.export;
 
-import sun.misc.CharacterEncoder;
-
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;