diff --git a/java/src/processing/mode/java/Compiler.java b/java/src/processing/mode/java/Compiler.java
index 1abc61790..2ab944d9a 100644
--- a/java/src/processing/mode/java/Compiler.java
+++ b/java/src/processing/mode/java/Compiler.java
@@ -47,8 +47,6 @@ public class Compiler {
   }
   
   
-//  public Compiler() { }
-
   /**
    * Compile with ECJ. See http://j.mp/8paifz for documentation.
    *
@@ -57,12 +55,6 @@ public class Compiler {
    * @return true if successful.
    * @throws RunnerException Only if there's a problem. Only then.
    */
-//  public boolean compile(Sketch sketch,
-//                         File srcFolder,
-//                         File binFolder,
-//                         String primaryClassName,
-//                         String sketchClassPath,
-//                         String bootClassPath) throws RunnerException {
   static public boolean compile(JavaBuild build) throws SketchException {
 
     // This will be filled in if anyone gets angry
@@ -81,27 +73,9 @@ public class Compiler {
     };
     //PApplet.println(baseCommand);
 
-    // make list of code files that need to be compiled
-//    String[] sourceFiles = new String[sketch.getCodeCount()];
-//    int sourceCount = 0;
-//    sourceFiles[sourceCount++] =
-//      new File(buildPath, primaryClassName + ".java").getAbsolutePath();
-//
-//    for (SketchCode code : sketch.getCode()) {
-//      if (code.isExtension("java")) {
-//        String path = new File(buildPath, code.getFileName()).getAbsolutePath();
-//        sourceFiles[sourceCount++] = path;
-//      }
-//    }
     String[] sourceFiles = Base.listFiles(build.getSrcFolder(), false, ".java");
-
-//    String[] command = new String[baseCommand.length + sourceFiles.length];
-//    System.arraycopy(baseCommand, 0, command, 0, baseCommand.length);
-//    // append each of the files to the command string
-//    System.arraycopy(sourceFiles, 0, command, baseCommand.length, sourceCount);
     String[] command = PApplet.concat(baseCommand, sourceFiles);
-
-//    PApplet.println(command);
+    //PApplet.println(command);
 
     try {
       // Load errors into a local StringBuilder
@@ -186,67 +160,11 @@ public class Compiler {
         exception = build.placeException(errorMessage,
                                          dotJavaFilename,
                                          dotJavaLineIndex);
-        /*
-        int codeIndex = 0; //-1;
-        int codeLine = -1;
-
-        // first check to see if it's a .java file
-        for (int i = 0; i < sketch.getCodeCount(); i++) {
-          SketchCode code = sketch.getCode(i);
-          if (code.isExtension("java")) {
-            if (dotJavaFilename.equals(code.getFileName())) {
-              codeIndex = i;
-              codeLine = dotJavaLineIndex;
-            }
-          }
-        }
-
-        // if it's not a .java file, codeIndex will still be 0
-        if (codeIndex == 0) {  // main class, figure out which tab
-          //for (int i = 1; i < sketch.getCodeCount(); i++) {
-          for (int i = 0; i < sketch.getCodeCount(); i++) {
-            SketchCode code = sketch.getCode(i);
-
-            if (code.isExtension("pde")) {
-              if (code.getPreprocOffset() <= dotJavaLineIndex) {
-                codeIndex = i;
-                //System.out.println("i'm thinkin file " + i);
-                codeLine = dotJavaLineIndex - code.getPreprocOffset();
-              }
-            }
-          }
-        }
-        //System.out.println("code line now " + codeLine);
-        exception = new RunnerException(errorMessage, codeIndex, codeLine, -1, false);
-        */
 
         if (exception == null) {
           exception = new SketchException(errorMessage);
         }
 
-        // for a test case once message parsing is implemented,
-        // use new Font(...) since that wasn't getting picked up properly.
-
-        /*
-        if (errorMessage.equals("cannot find symbol")) {
-          handleCannotFindSymbol(reader, exception);
-
-        } else if (errorMessage.indexOf("is already defined") != -1) {
-          reader.readLine();  // repeats the line of code w/ error
-          int codeColumn = caretColumn(reader.readLine());
-          exception = new RunnerException(errorMessage,
-                                          codeIndex, codeLine, codeColumn);
-
-        } else if (errorMessage.startsWith("package") &&
-                   errorMessage.endsWith("does not exist")) {
-          // Because imports are stripped out and re-added to the 0th line of
-          // the preprocessed code, codeLine will always be wrong for imports.
-          exception = new RunnerException("P" + errorMessage.substring(1) +
-                                          ". You might be missing a library.");
-        } else {
-          exception = new RunnerException(errorMessage);
-        }
-        */
         if (errorMessage.startsWith("The import ") &&
             errorMessage.endsWith("cannot be resolved")) {
           // The import poo cannot be resolved
@@ -273,14 +191,6 @@ public class Compiler {
             }
           }
 
-//          // Actually create the folder and open it for the user
-//          File sketchbookLibraries = Base.getSketchbookLibrariesFolder();
-//          if (!sketchbookLibraries.exists()) {
-//            if (sketchbookLibraries.mkdirs()) {
-//              Base.openFolder(sketchbookLibraries);
-//            }
-//          }
-
         } else if (errorMessage.endsWith("cannot be resolved to a type")) {
           // xxx cannot be resolved to a type
           //xxx c;
@@ -393,349 +303,6 @@ public class Compiler {
   }
 
 
-  /**
-   * Fire up 'ole javac based on <a href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/solaris/javac.html#proginterface">this interface</a>.
-   *
-   * @param sketch Sketch object to be compiled.
-   * @param buildPath Where the temporary files live and will be built from.
-   * @return
-   * @throws RunnerException Only if there's a problem. Only then.
-   */
-//  public boolean compileJavac(Sketch sketch,
-//                         String buildPath) throws RunnerException {
-//    // This will be filled in if anyone gets angry
-//    RunnerException exception = null;
-//
-//    String baseCommand[] = new String[] {
-//      "-source", "1.5",
-//      "-target", "1.5",
-//      "-classpath", sketch.getClassPath(),
-//      "-nowarn", // we're not currently interested in warnings (ignored?)
-//      "-d", buildPath // output the classes in the buildPath
-//    };
-//    //PApplet.println(baseCommand);
-//
-//    // make list of code files that need to be compiled
-//    // (some files are skipped if they contain no class)
-//    String[] preprocNames = new String[sketch.getCodeCount()];
-//    int preprocCount = 0;
-//    for (int i = 0; i < sketch.getCodeCount(); i++) {
-//      if (sketch.getCode(i).preprocName != null) {
-//        preprocNames[preprocCount++] = sketch.getCode(i).preprocName;
-//      }
-//    }
-//    String[] command = new String[baseCommand.length + preprocCount];
-//    System.arraycopy(baseCommand, 0, command, 0, baseCommand.length);
-//    // append each of the files to the command string
-//    for (int i = 0; i < preprocCount; i++) {
-//      command[baseCommand.length + i] =
-//        buildPath + File.separator + preprocNames[i];
-//    }
-//    //PApplet.println(command);
-//
-//    int result = -1;  // needs to be set bad by default, in case hits IOE below
-//
-//    try {
-//      // Load errors into a local StringBuffer
-//      final StringBuffer errorBuffer = new StringBuffer();
-//
-//      // Create single method dummy writer class to slurp errors from javac
-//      Writer internalWriter = new Writer() {
-//          public void write(char[] buf, int off, int len) {
-//            errorBuffer.append(buf, off, len);
-//          }
-//
-//          public void flush() { }
-//
-//          public void close() { }
-//        };
-//      // Wrap as a PrintWriter since that's what compile() wants
-//      PrintWriter writer = new PrintWriter(internalWriter);
-//
-//      result = com.sun.tools.javac.Main.compile(command, writer);
-//
-//      // Close out the stream for good measure
-//      writer.flush();
-//      writer.close();
-//
-////      BufferedReader reader =
-////        new BufferedReader(new StringReader(errorBuffer.toString()));
-//      //System.err.println(errorBuffer.toString());
-//
-////      String m = errorBuffer.toString();
-//      //ParsePosition mp = new ParsePosition(0);
-//
-////      while (mp.getIndex() < m.length()) {  // reading messages
-//      String line = null;
-//      int lineIndex = 0;
-//      String[] lines = PApplet.split(errorBuffer.toString(), '\n');
-//      int lineCount = lines.length;
-//      while (lineIndex < lineCount) {
-//      //while ((line = reader.readLine()) != null) {
-//        //System.out.println("got line " + line);  // debug
-//
-//        /*
-//compiler.misc.count.error=\
-//    {0} error
-//compiler.misc.count.error.plural=\
-//    {0} errors
-//compiler.misc.count.warn=\
-//    {0} warning
-//compiler.misc.count.warn.plural=\
-//    {0} warnings
-//         */
-//        // Check to see if this is the last line.
-////        if ((PApplet.match(line, "\\d+ error[s]?") != null) ||
-////            (PApplet.match(line, "\\d+ warning[s]?") != null)) {
-////          break;
-////        }
-//        if (isCompilerMatch(line, "compiler.misc.count.error") ||
-//            isCompilerMatch(line, "compiler.misc.count.error.plural") ||
-//            isCompilerMatch(line, "compiler.misc.count.warn") ||
-//            isCompilerMatch(line, "compiler.misc.count.warn.plural")) {
-//            break;
-//        }
-//
-//        // Hide these because people are getting confused
-//        // http://dev.processing.org/bugs/show_bug.cgi?id=817
-//        // com/sun/tools/javac/resources/compiler.properties
-//        //if (line.startsWith("Note: ")) {
-//        String compilerNote = compilerResources.getString("compiler.note.note");
-//        MessageFormat noteFormat = new MessageFormat(compilerNote + " {0}");
-//        Object[] noteFound;
-//        try {
-//          noteFound = noteFormat.parse(line);
-//          if (noteFound != null) {
-//            System.out.println("gefunden " + noteFound[0]);
-//
-//            /*
-//          // if you mention serialVersionUID one more time, i'm kickin' you out
-//          if (line.indexOf("serialVersionUID") != -1) continue;
-//          // {0} uses unchecked or unsafe operations.
-//          // Some input files use unchecked or unsafe operations.
-//          if (line.indexOf("or unsafe operations") != -1) continue;
-//          // {0} uses or overrides a deprecated API.
-//          // Some input files use or override a deprecated API.
-//          if (line.indexOf("or override") != -1) continue;
-//          // Recompile with -Xlint:deprecation for details.
-//          // Recompile with -Xlint:unchecked for details.
-//          if (line.indexOf("Recompile with -Xlint:") != -1) continue;
-//          System.err.println(line);
-//             */
-//            continue;
-//          }
-//        } catch (ParseException e) {
-//          e.printStackTrace();
-//        }
-//
-//        // get first line, which contains file name, line number,
-//        // and at least the first line of the error message
-//        String errorFormat = "([\\w\\d_]+.java):(\\d+):\\s*(.*)\\s*";
-//        String[] pieces = PApplet.match(line, errorFormat);
-//
-//        // if it's something unexpected, die and print the mess to the console
-//        if (pieces == null) {
-//          exception = new RunnerException("Cannot parse error text: " + line);
-//          exception.hideStackTrace();
-//          // Send out the rest of the error message to the console.
-//          System.err.println(line);
-//          //while ((line = reader.readLine()) != null) {
-//          for (int i = lineIndex; i < lineCount; i++) {
-//            System.err.println(lines[i]);
-//          }
-//          break;
-//        }
-//
-//        // translate the java filename and line number into a un-preprocessed
-//        // location inside a source file or tab in the environment.
-//        String dotJavaFilename = pieces[0];
-//        // Line numbers are 1-indexed from javac
-//        int dotJavaLineIndex = PApplet.parseInt(pieces[1]) - 1;
-//        String errorMessage = pieces[2];
-//
-//        int codeIndex = -1;
-//        int codeLine = -1;
-//        for (int i = 0; i < sketch.getCodeCount(); i++) {
-//          String name = sketch.getCode(i).preprocName;
-//          if ((name != null) && dotJavaFilename.equals(name)) {
-//            codeIndex = i;
-//          }
-//        }
-//        //System.out.println("code index/line are " + codeIndex + " " + codeLine);
-//        //System.out.println("java line number " + dotJavaLineIndex + " from " + dotJavaFilename);
-//
-//        if (codeIndex == 0) {  // main class, figure out which tab
-//          for (int i = 1; i < sketch.getCodeCount(); i++) {
-//            SketchCode code = sketch.getCode(i);
-//
-//            if (code.flavor == Sketch.PDE) {
-//              if (code.preprocOffset <= dotJavaLineIndex) {
-//                codeIndex = i;
-//                //System.out.println("i'm thinkin file " + i);
-//              }
-//            }
-//          }
-//        }
-//        //System.out.println("preproc offset is " + sketch.getCode(codeIndex).preprocOffset);
-//        codeLine = dotJavaLineIndex - sketch.getCode(codeIndex).preprocOffset;
-//        //System.out.println("code line now " + codeLine);
-//        exception = new RunnerException(errorMessage, codeIndex, codeLine, -1, false);
-//
-//        // for a test case once message parsing is implemented,
-//        // use new Font(...) since that wasn't getting picked up properly.
-//
-//        if (errorMessage.equals("cannot find symbol")) {
-//          handleCannotFindSymbol(reader, exception);
-//
-//        } else if (errorMessage.indexOf("is already defined") != -1) {
-//          reader.readLine();  // repeats the line of code w/ error
-//          int codeColumn = caretColumn(reader.readLine());
-//          exception = new RunnerException(errorMessage,
-//                                          codeIndex, codeLine, codeColumn);
-//
-//        } else if (errorMessage.startsWith("package") &&
-//                   errorMessage.endsWith("does not exist")) {
-//          // Because imports are stripped out and re-added to the 0th line of
-//          // the preprocessed code, codeLine will always be wrong for imports.
-//          exception = new RunnerException("P" + errorMessage.substring(1) +
-//                                          ". You might be missing a library.");
-//        } else {
-//          exception = new RunnerException(errorMessage);
-//        }
-//        if (exception != null) {
-//          // The stack trace just shows that this happened inside the compiler,
-//          // which is a red herring. Don't ever show it for compiler stuff.
-//          exception.hideStackTrace();
-//          break;
-//        }
-//      }
-//    } catch (IOException e) {
-//      String bigSigh = "Error while compiling. (" + e.getMessage() + ")";
-//      exception = new RunnerException(bigSigh);
-//      e.printStackTrace();
-//      result = 1;
-//    }
-//    // In case there was something else.
-//    if (exception != null) throw exception;
-//
-//    // Success means that 'result' is set to zero
-//    return (result == 0);
-//  }
-//
-//
-//  boolean isCompilerMatch(String line, String format) {
-//    return compilerMatch(line, format) != null;
-//  }
-//
-//
-//  Object[] compilerMatch(String line, String name) {
-//    String format = compilerResources.getString(name);
-//    MessageFormat mf = new MessageFormat(format);
-//    Object[] matches = null;
-//    try {
-//      matches = mf.parse(line);
-//    } catch (ParseException e) {
-//      e.printStackTrace();
-//    }
-//    return matches;
-//  }
-
-
-//  boolean isCompilerMatch(String line, ParsePosition pos, String format) {
-//    return compilerMatch(line, pos, format) != null;
-//  }
-//
-//
-//  Object[] compilerMatch(String line, ParsePosition pos, String name) {
-//    String format = compilerResources.getString(name);
-//    MessageFormat mf = new MessageFormat(format);
-//    Object[] matches = mf.parse(line, pos);
-//    return matches;
-//  }
-
-
-  // Tell-tale signs of old code copied and pasted from the web.
-  // Detect classes BFont, BGraphics, BImage; methods framerate, push;
-  // and variables LINE_LOOP and LINE_STRIP.
-//  static HashMap crusties = new HashMap();
-//  static {
-//    crusties.put("BFont", new Object());
-//    crusties.put("BGraphics", new Object());
-//    crusties.put("BImage", new Object());
-//    crusties.put("framerate", new Object());
-//    crusties.put("push", new Object());
-//    crusties.put("LINE_LOOP", new Object());
-//    crusties.put("LINE_STRIP", new Object());
-//  }
-
-
-//  void handleCannotFindSymbol(BufferedReader reader,
-//                              RunnerException rex) throws IOException {
-//    String symbolLine = reader.readLine();
-//    String locationLine = reader.readLine();
-//    /*String codeLine =*/ reader.readLine();
-//    String caretLine = reader.readLine();
-//    rex.setCodeColumn(caretColumn(caretLine));
-//
-//    String[] pieces =
-//      PApplet.match(symbolLine, "symbol\\s*:\\s*(\\w+)\\s+(.*)");
-//    if (pieces != null) {
-//      if (pieces[0].equals("class") ||
-//          pieces[0].equals("variable")) {
-//        rex.setMessage("Cannot find a " + pieces[0] + " " +
-//                       "named \u201C" + pieces[1] + "\u201D");
-//        if (crusties.get(pieces[1]) != null) {
-//          handleCrustyCode(rex);
-//        }
-//
-//      } else if (pieces[0].equals("method")) {
-//        int leftParen = pieces[1].indexOf("(");
-//        int rightParen = pieces[1].indexOf(")");
-//
-//        String methodName = pieces[1].substring(0, leftParen);
-//        String methodParams = pieces[1].substring(leftParen + 1, rightParen);
-//
-//        String message =
-//          "Cannot find a function named \u201C" + methodName + "\u201D";
-//        if (methodParams.length() > 0) {
-//          if (methodParams.indexOf(',') != -1) {
-//            message += " with parameters ";
-//          } else {
-//            message += " with parameter ";
-//          }
-//          message += methodParams;
-//        }
-//
-//        String locationClass = "location: class ";
-//        if (locationLine.startsWith(locationClass) &&
-//            // don't include the class name when it's a temp class
-//            locationLine.indexOf("Temporary_") == -1) {
-//          String className = locationLine.substring(locationClass.length());
-//          // If no dot exists, -1 + 1 is 0, so this will have no effect.
-//          className = className.substring(className.lastIndexOf('.') + 1);
-//          int bracket = className.indexOf('[');
-//          if (bracket == -1) {
-//            message += " in class " + className;
-//          } else {
-//            className = className.substring(0, bracket);
-//            message += " for an array of " + className + " objects";
-//          }
-//        }
-//        message += ".";
-//        rex.setMessage(message);
-//
-//        // On second thought, make sure this isn't just some alpha/beta code
-//        if (crusties.get(methodName) != null) {
-//          handleCrustyCode(rex);
-//        }
-//
-//      } else {
-//        System.out.println(symbolLine);
-//      }
-//    }
-//  }
-
-
   static protected void handleCrustyCode() {
     System.err.println("This code needs to be updated " +
                        "for this version of Processing, " +