diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
index 1ef67f1de646cdc804ccaf2c2c5f2e2c2d7672ca..87a9afdd9a692d680b413f3bd3da28f14c2c3a89 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
@@ -81,7 +81,7 @@ public class REmbedded {
         boolean useEmbedded = consoleHandler == embeddedConsoleHandler;
         OutputStream stdOut = useEmbedded ? embeddedConsoleHandler.createStdOutputStream(System.out) : System.out;
         OutputStream stdErr = useEmbedded ? embeddedConsoleHandler.createErrOutputStream(System.err) : System.err;
-        context = Context.newBuilder().allowHostAccess(true).arguments("R", options.getArguments()).in(input).out(stdOut).err(stdErr).build();
+        context = Context.newBuilder().allowAllAccess(true).arguments("R", options.getArguments()).in(input).out(stdOut).err(stdErr).build();
         consoleHandler.setContext(context);
         context.eval(INIT);
 
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile b/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
index 32cb771f23ac4b2bde415cd554cebe410e7163d6..41a01d74ab8c8c08cd7f95027f903b9939b881c6 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
@@ -59,35 +59,18 @@ FFLAGS :=
 # uncomment to see exactly where headers are being read from
 #CFLAGS := $(CFLAGS) -H
 
-#all: Makefile $(C_OBJECTS) $(GNUR_C_OBJECTS) $(GNUR_F_OBJECTS)
 all: Makefile $(C_OBJECTS)
 
 $(C_OBJECTS): | $(OBJ)
 
-#$(GNUR_C_OBJECTS): | $(OBJ)
-
-#$(GNUR_F_OBJECTS): | $(OBJ)
-
 $(OBJ):
 	mkdir -p $(OBJ)
 
-#$(OBJ)/%.bc: $(GNUR_APPL_SRC)/%.c
-#	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-
-#$(OBJ)/%.bc: $(GNUR_MAIN_SRC)/%.c
-#	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-
 $(OBJ)/%.bc: %.c $(FASTR_NATIVE_DIR)/include/Rinternals.h rffiutils.h $(TRUFFLE_COMMON_H_SOURCES) ../common/rffi_upcallsindex.h
 	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
 
-#$(OBJ)/%.bc: ../common/%.c $(FASTR_NATIVE_DIR)/include/Rinternals.h
-#	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-
 $(OBJ)/%.bc: ../truffle_common/%.c 
 	$(CC) $(CFLAGS) $(INCLUDES) $(SUPPRESS_WARNINGS) -c $< -o $@
 
-#$(OBJ)/%.bc: $(GNUR_APPL_SRC)/%.f
-#	$(F77) $(FFLAGS) $(FPICFLAGS) -c $< -o $@
-
 clean:
 	rm -rf $(OBJ)
diff --git a/com.oracle.truffle.r.native/llvm_tools/llvm-helper b/com.oracle.truffle.r.native/llvm_tools/llvm-helper
index 47c078e9788fda1a9105b8993070978a5d002294..2215a9037866d49db2a27bdc83743082777962a9 100644
--- a/com.oracle.truffle.r.native/llvm_tools/llvm-helper
+++ b/com.oracle.truffle.r.native/llvm_tools/llvm-helper
@@ -147,12 +147,6 @@ function mem2reg_opt() {
    fi
 }
 
-#function fake_obj() {
-#  f=`basename $llvm_ir_file`
-#  d=`dirname $llvm_ir_file`
-#  runit touch ${d}/${f%%.*}.o
-#}
-
 # Input: all the arguments to the original command line
 function create_bc_lib() {
   bcfiles=""
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
index 8f884c1764b258a17918ede70dd4be90edcbf03d..8f7b396e2d8941bb0b11753b031745abb9e1f23f 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/engine/interop/AbstractMRTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractMRTest {
 
     @BeforeClass
     public static void before() {
-        context = Context.newBuilder("R", "llvm").build();
+        context = Context.newBuilder("R", "llvm").allowAllAccess(true).build();
         context.eval("R", "1"); // initialize context
         context.enter();
     }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
index d6e9c827b8c1402b42d3cb2555870c936979928f..9e521c524e63104c0c21a01208cabe7b43dace06 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
@@ -134,7 +134,7 @@ public final class FastRSession implements RSession {
         ChildContextInfo ctx = ChildContextInfo.create(params, env, contextKind, contextKind == ContextKind.SHARE_NOTHING ? null : mainRContext, input, output, output);
         RContext.childInfo = ctx;
 
-        return Context.newBuilder("R", "llvm").engine(mainEngine).build();
+        return Context.newBuilder("R", "llvm").allowAllAccess(true).engine(mainEngine).build();
     }
 
     private FastRSession() {
@@ -154,7 +154,7 @@ public final class FastRSession implements RSession {
             ChildContextInfo info = ChildContextInfo.create(params, null, ContextKind.SHARE_NOTHING, null, input, output, output);
             RContext.childInfo = info;
             mainEngine = Engine.newBuilder().in(input).out(output).err(output).build();
-            mainContext = Context.newBuilder("R", "llvm").engine(mainEngine).build();
+            mainContext = Context.newBuilder("R", "llvm").allowAllAccess(true).engine(mainEngine).build();
             mainRContext = mainContext.eval(GET_CONTEXT).asHostObject();
         } finally {
             try {