diff --git a/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java b/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java
index ef7fbb11bf..e2eade8f82 100644
--- a/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java
+++ b/dbms/src/main/java/org/polypheny/db/processing/AbstractQueryProcessor.java
@@ -1068,8 +1068,6 @@ private PreparedResult<PolyValue> implement( AlgRoot root, AlgDataType parameter
         }
 
         final AlgDataType jdbcType = QueryProcessorHelpers.makeStruct( root.alg.getCluster().getTypeFactory(), root.validatedRowType );
-        //TODO DL: get metadata instead of null
-        List<List<String>> fieldOrigins = Collections.nCopies( jdbcType.getFieldCount(), null );
 
         final Prefer prefer = Prefer.ARRAY;
         final Convention resultConvention =
@@ -1115,7 +1113,7 @@ private PreparedResult<PolyValue> implement( AlgRoot root, AlgDataType parameter
         return new PreparedResultImpl<>(
                 resultType,
                 parameterRowType,
-                fieldOrigins,
+                Collections.nCopies( jdbcType.getFieldCount(), null ), // we do not have the origin of the fields so we provide null for all
                 root.collation.getFieldCollations().isEmpty()
                         ? ImmutableList.of()
                         : ImmutableList.of( root.collation ),
diff --git a/dbms/src/main/java/org/polypheny/db/transaction/StatementImpl.java b/dbms/src/main/java/org/polypheny/db/transaction/StatementImpl.java
index 20b2f56aad..7f22093c0f 100644
--- a/dbms/src/main/java/org/polypheny/db/transaction/StatementImpl.java
+++ b/dbms/src/main/java/org/polypheny/db/transaction/StatementImpl.java
@@ -173,7 +173,6 @@ public void close() {
             dataContext.getParameterValues().clear();
         }
         fileInputHandles.forEach( FileInputHandle::close );
-        // dataContext = null; todo dl check how we want to handle this long term
     }
 
 
diff --git a/dbms/src/main/java/org/polypheny/db/transaction/TransactionImpl.java b/dbms/src/main/java/org/polypheny/db/transaction/TransactionImpl.java
index 188c92322c..c29472892b 100644
--- a/dbms/src/main/java/org/polypheny/db/transaction/TransactionImpl.java
+++ b/dbms/src/main/java/org/polypheny/db/transaction/TransactionImpl.java
@@ -72,7 +72,7 @@ public class TransactionImpl implements Transaction, Comparable<Object> {
     private final PolyXid xid;
 
     @Getter
-    private AtomicBoolean cancelFlag = new AtomicBoolean();
+    private final AtomicBoolean cancelFlag = new AtomicBoolean();
 
     @Getter
     private final LogicalUser user;