--- old/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java	2016-07-19 16:57:27.695117617 -0700
+++ new/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionEnv.java	2016-07-19 16:57:27.584114792 -0700
@@ -28,14 +28,11 @@
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.List;
-import jdk.jshell.EvalException;
 import jdk.jshell.JShell;
-import jdk.jshell.UnresolvedReferenceException;
 
 /**
  * Functionality made available to a pluggable JShell execution engine.  It is
- * provided to the execution engine by the core JShell implementation calling
- * {@link ExecutionControl#start(jdk.jshell.spi.ExecutionEnv) }.
+ * provided to the execution engine by the core JShell implementation.
  * <p>
  * This interface is designed to provide the access to core JShell functionality
  * needed to implement ExecutionControl.
@@ -66,11 +63,6 @@
     PrintStream userErr();
 
     /**
-     * @return the JShell instance
-     */
-    JShell state();
-
-    /**
      * Returns the additional VM options to be used when launching the remote
      * JVM. This is advice to the execution engine.
      * <p>
@@ -81,47 +73,8 @@
     List<String> extraRemoteVMOptions();
 
     /**
-     * Retrieves the class file bytes for the specified wrapper class.
-     *
-     * @param className the name of the wrapper class
-     * @return the current class file bytes as a byte array
-     */
-    byte[] getClassBytes(String className);
-
-    /**
-     * Creates an {@code EvalException} corresponding to a user exception. An
-     * user exception thrown during
-     * {@link ExecutionControl#invoke(java.lang.String, java.lang.String) }
-     * should be converted to an {@code EvalException} using this method.
-     *
-     * @param message the exception message to use (from the user exception)
-     * @param exceptionClass the class name of the user exception
-     * @param stackElements the stack trace elements to install
-     * @return a user API EvalException for the user exception
-     */
-    EvalException createEvalException(String message, String exceptionClass,
-            StackTraceElement[] stackElements);
-
-    /**
-     * Creates an {@code UnresolvedReferenceException} for the Snippet identifed
-     * by the specified identifier. An {@link SPIResolutionException} thrown
-     * during {@link ExecutionControl#invoke(java.lang.String, java.lang.String) }
-     * should be converted to an {@code UnresolvedReferenceException} using
-     * this method.
-     * <p>
-     * The identifier is an internal id, different from the id in the API. This
-     * internal id is returned by {@link SPIResolutionException#id()}.
-     *
-     * @param id the internal integer identifier
-     * @param stackElements the stack trace elements to install
-     * @return an {@code UnresolvedReferenceException} for the unresolved
-     * reference
-     */
-    UnresolvedReferenceException createUnresolvedReferenceException(int id,
-            StackTraceElement[] stackElements);
-
-    /**
      * Reports that the execution engine has shutdown.
      */
     void closeDown();
+
 }