--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Mon Jan 11 14:42:58 2016 +0100
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLLanguage.java	Mon Jan 11 14:46:50 2016 +0100
@@ -209,7 +209,7 @@
     protected SLContext createContext(Env env) {
         final BufferedReader in = new BufferedReader(new InputStreamReader(env.in()));
         final PrintWriter out = new PrintWriter(env.out(), true);
-        SLContext context = new SLContext(this, env, in, out);
+        SLContext context = new SLContext(env, in, out);
         for (NodeFactory<? extends SLBuiltinNode> builtin : builtins) {
             context.installBuiltin(builtin, true);
         }
@@ -411,7 +411,7 @@
             return cached;
         }
         parsingCount++;
-        final SLContext c = new SLContext(this);
+        final SLContext c = new SLContext();
         final Exception[] failed = {null};
         try {
             c.evalSource(code);

--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java	Mon Jan 11 14:42:58 2016 +0100
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/runtime/SLContext.java	Mon Jan 11 14:46:50 2016 +0100
@@ -92,23 +92,21 @@
 public final class SLContext extends ExecutionContext {
     private static final Layout LAYOUT = Layout.createLayout();
 
-    private final SLLanguage language;
     private final BufferedReader input;
     private final PrintWriter output;
     private final SLFunctionRegistry functionRegistry;
     private final Shape emptyShape;
     private final TruffleLanguage.Env env;
 
-    public SLContext(SLLanguage language, TruffleLanguage.Env env, BufferedReader input, PrintWriter output) {
-        this(language, env, input, output, true);
+    public SLContext(TruffleLanguage.Env env, BufferedReader input, PrintWriter output) {
+        this(env, input, output, true);
     }
 
-    public SLContext(SLLanguage language) {
-        this(language, null, null, null, false);
+    public SLContext() {
+        this(null, null, null, false);
     }
 
-    private SLContext(SLLanguage language, TruffleLanguage.Env env, BufferedReader input, PrintWriter output, boolean installBuiltins) {
-        this.language = language;
+    private SLContext(TruffleLanguage.Env env, BufferedReader input, PrintWriter output, boolean installBuiltins) {
         this.input = input;
         this.output = output;
         this.env = env;
@@ -141,10 +139,6 @@
         return functionRegistry;
     }
 
-    public SLLanguage getLanguage() {
-        return language;
-    }
-
     /**
      * Adds all builtin functions to the {@link SLFunctionRegistry}. This method lists all
      * {@link SLBuiltinNode builtin implementation classes}.