diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subset.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subset.java
index 01c2d77264d54b2660a33fad061310dc35e1bac3..82199ccb54e0f2d861beb07bba78376d41e3f74d 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subset.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subset.java
@@ -40,11 +40,9 @@ import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNames
 import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
 import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ConvertIndex;
 import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ProfiledValue;
-import com.oracle.truffle.r.nodes.qirinterface.QIRTranslateVisitor;
 import com.oracle.truffle.r.runtime.ArgumentsSignature;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
-import com.oracle.truffle.r.runtime.context.RContext;
 import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
 import com.oracle.truffle.r.runtime.data.RList;
@@ -52,13 +50,8 @@ import com.oracle.truffle.r.runtime.data.RLogical;
 import com.oracle.truffle.r.runtime.data.RMissing;
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
-import com.oracle.truffle.r.runtime.env.REnvironment;
 import com.oracle.truffle.r.runtime.nodes.RNode;
 
-import qir.ast.QIRNode;
-import qir.ast.operator.QIRFilter;
-import qir.ast.operator.QIRProject;
-
 /**
  * Subset special only handles single element integer/double index. In the case of list, we need to
  * create the actual list otherwise we just return the primitive type.
@@ -128,18 +121,6 @@ public abstract class Subset extends RBuiltinNode {
     }
 
     public static RNode special(ArgumentsSignature signature, RNode[] args, boolean inReplacement) {
-
-        if (args[0].isRSyntaxNode() && args[0].asRSyntaxNode() instanceof REnvironment &&
-                        ((REnvironment) args[0].asRSyntaxNode()).get("queryId") != null) {
-            final Object queryId = ((REnvironment) args[0].asRSyntaxNode()).get("queryId");
-            if (queryId != null) {
-                final QIRNode filter = args[1].asRSyntaxNode().accept(QIRTranslateVisitor.instance);
-                final QIRNode format = args[2].asRSyntaxNode().accept(QIRTranslateVisitor.instance);
-                RContext.queries.set((int) queryId, new QIRProject(null, format, new QIRFilter(null,
-                                filter, RContext.queries.get((int) queryId))));
-                return args[0];
-            }
-        }
         if (signature.getNonNullCount() == 0 && (args.length == 2 || args.length == 3)) {
             ProfiledValue profiledVector = profile(args[0]);
             ConvertIndex index = convertIndex(args[1]);