diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
index b3d01b9c83b..1191995d725 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/JavaCharStream.java
@@ -13,7 +13,7 @@
 class JavaCharStream
 {
   /** Whether parser is static. */
-  
+
 @SuppressWarnings("all")
 public static final boolean staticFlag = false;
 
@@ -65,7 +65,7 @@ static final int hexval(char c) throws java.io.IOException {
   }
 
 /* Position in buffer. */
-  
+
 @SuppressWarnings("all")
 public int bufpos = -1;
   int bufsize;
@@ -90,10 +90,10 @@ static final int hexval(char c) throws java.io.IOException {
   protected int tabSize = 1;
   protected boolean trackLineColumn = true;
 
-  
+
 @SuppressWarnings("all")
 public void setTabSize(int i) { tabSize = i; }
-  
+
 @SuppressWarnings("all")
 public int getTabSize() { return tabSize; }
 
@@ -185,7 +185,7 @@ protected char ReadByte() throws java.io.IOException
   }
 
 /* @return starting character for token. */
-  
+
 @SuppressWarnings("all")
 public char BeginToken() throws java.io.IOException
   {
@@ -267,7 +267,7 @@ else if (prevCharIsCR)
   }
 
 /* Read a character. */
-  
+
 @SuppressWarnings("all")
 public char readChar() throws java.io.IOException
   {
@@ -367,7 +367,7 @@ public char readChar() throws java.io.IOException
    * @see #getEndColumn
    */
   @Deprecated
-  
+
 @SuppressWarnings("all")
 public int getColumn() {
     return bufcolumn[bufpos];
@@ -379,7 +379,7 @@ public int getColumn() {
    * @return the line number.
    */
   @Deprecated
-  
+
 @SuppressWarnings("all")
 public int getLine() {
     return bufline[bufpos];
@@ -388,7 +388,7 @@ public int getLine() {
 /** Get end column.
  * @return the end column or -1
  */
-  
+
 @SuppressWarnings("all")
 public int getEndColumn() {
     return bufcolumn[bufpos];
@@ -397,7 +397,7 @@ public int getEndColumn() {
 /** Get end line.
  * @return the end line number or -1
  */
-  
+
 @SuppressWarnings("all")
 public int getEndLine() {
     return bufline[bufpos];
@@ -405,21 +405,21 @@ public int getEndLine() {
 
 /** Get the beginning column.
  * @return column of token start */
-  
+
 @SuppressWarnings("all")
 public int getBeginColumn() {
     return bufcolumn[tokenBegin];
   }
 
 /** @return line number of token start */
-  
+
 @SuppressWarnings("all")
 public int getBeginLine() {
     return bufline[tokenBegin];
   }
 
 /** Retreat. */
-  
+
 @SuppressWarnings("all")
 public void backup(int amount) {
 
@@ -434,7 +434,7 @@ public void backup(int amount) {
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -455,7 +455,7 @@ public JavaCharStream(java.io.Reader dstream,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -465,16 +465,15 @@ public JavaCharStream(java.io.Reader dstream,
 
 /** Constructor.
  * @param dstream the underlying data source.
- * @param startline line number of the first character of the stream, mostly for error messages.
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream)
   {
     this(dstream, 1, 1, 4096);
   }
 /* Reinitialise. */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -497,7 +496,7 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -506,14 +505,14 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream)
   {
     ReInit(dstream, 1, 1, 4096);
   }
 /** Constructor. */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -527,7 +526,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -542,7 +541,7 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
                         int startcolumn) throws java.io.UnsupportedEncodingException
@@ -555,7 +554,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
                         int startcolumn)
@@ -568,7 +567,7 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -578,7 +577,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.
   /** Constructor.
    * @param dstream the underlying data source.
    */
-  
+
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream)
   {
@@ -592,7 +591,7 @@ public JavaCharStream(java.io.InputStream dstream)
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -606,7 +605,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -620,7 +619,7 @@ public void ReInit(java.io.InputStream dstream, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
                      int startcolumn) throws java.io.UnsupportedEncodingException
@@ -632,7 +631,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
                      int startcolumn)
@@ -644,7 +643,7 @@ public void ReInit(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -654,7 +653,7 @@ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.
 /** Reinitialise.
  * @param dstream the underlying data source.
  */
-  
+
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream)
   {
@@ -663,7 +662,7 @@ public void ReInit(java.io.InputStream dstream)
 
   /** Get the token timage.
    * @return token image as String */
-  
+
 @SuppressWarnings("all")
 public String GetImage()
   {
@@ -677,7 +676,7 @@ public String GetImage()
   /** Get the suffix as an array of characters.
    * @param len the length of the array to return.
    * @return suffix */
-  
+
 @SuppressWarnings("all")
 public char[] GetSuffix(int len)
   {
@@ -696,7 +695,7 @@ public char[] GetSuffix(int len)
   }
 
   /** Set buffers back to null when finished. */
-  
+
 @SuppressWarnings("all")
 public void Done()
   {
@@ -712,7 +711,7 @@ public void Done()
    * @param newLine the new line number.
    * @param newCol the new column number.
    */
-  
+
 @SuppressWarnings("all")
 public void adjustBeginLineColumn(int newLine, int newCol)
   {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
index ae1374c9021..62f4e308474 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphUtils.java
@@ -28,7 +28,6 @@
 import org.apache.jena.query.* ;
 import org.apache.jena.rdf.model.* ;
 import org.apache.jena.shared.PropertyNotFoundException;
-import org.apache.jena.sparql.engine.ExecutionContext;
 import org.apache.jena.sparql.util.NotUniqueException ;
 import org.apache.jena.sparql.util.PropertyRequiredException ;
 import org.apache.jena.sparql.util.QueryExecUtils;
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/eval/ShapeEvalEachOf.java b/jena-shex/src/main/java/org/apache/jena/shex/eval/ShapeEvalEachOf.java
index c788818eea2..bb0696b01ad 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/eval/ShapeEvalEachOf.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/eval/ShapeEvalEachOf.java
@@ -122,11 +122,8 @@ private static List<List<Set<Triple>>> partition(Collection<Triple> triples,
 //        if ( triples.stream().noneMatch(t->predicateToTripleExprs.containsKey(t.getPredicate())) )
 //            return null;
 
-
         // Start. One empty partition
         List<Set<Triple>> emptyPartial = emptyPartition(tripleExprs);
-
-
         List<List<Set<Triple>>> partials = new ArrayList<>();
         partials.add(emptyPartial);
 
@@ -178,5 +175,4 @@ private static List<Set<Triple>> emptyPartition(List<TripleExpression> tripleExp
         }
         return partition;
     }
-
 }
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprAND.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprAND.java
index e6eb0f6b164..aece2703e7e 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprAND.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprAND.java
@@ -44,7 +44,7 @@ public static ShapeExpression create(List<ShapeExpression> acc) {
     List<ShapeExpression> shapeExpressions;
 
     private ShapeExprAND(List<ShapeExpression> expressions) {
-        super(null);
+        super();
         this.shapeExpressions = expressions;
     }
 
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprDot.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprDot.java
index 54257714921..c82021aecb9 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprDot.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprDot.java
@@ -27,7 +27,7 @@
 public class ShapeExprDot extends ShapeExpression {
 
     public ShapeExprDot() {
-        super(null);
+        super();
     }
 
     @Override
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprExternal.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprExternal.java
index 07b7606e14b..5760a63bec4 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprExternal.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprExternal.java
@@ -26,7 +26,7 @@
 public class ShapeExprExternal extends ShapeExpression {
 
     public ShapeExprExternal() {
-        super(null);
+        super();
     }
 
     @Override
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprFalse.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprFalse.java
index 5e52bb0f310..d37d9cee521 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprFalse.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprFalse.java
@@ -28,7 +28,7 @@
 public class ShapeExprFalse extends ShapeExpression {
 
     public ShapeExprFalse() {
-        super(null);
+        super();
     }
 
     @Override
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNOT.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNOT.java
index 7ae82210201..5d08372ffa2 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNOT.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNOT.java
@@ -39,7 +39,7 @@ public class ShapeExprNOT extends ShapeExpression {
     private final ShapeExpression other;
 
     public ShapeExprNOT(ShapeExpression shapeExpression) {
-        super(null);
+        super();
         this.other = shapeExpression;
     }
 
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNone.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNone.java
index 378a91339e1..54b2e785bd9 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNone.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprNone.java
@@ -30,7 +30,7 @@ public class ShapeExprNone extends ShapeExpression {
     public static ShapeExpression get() { return instance ; }
 
     private ShapeExprNone() {
-        super(null);
+        super();
     }
 
     @Override
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprOR.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprOR.java
index b8d42fa5c8b..e14690d2941 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprOR.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprOR.java
@@ -41,7 +41,7 @@ public static ShapeExpression create(List<ShapeExpression> acc) {
     private List<ShapeExpression> shapeExpressions;
 
     private ShapeExprOR(List<ShapeExpression> expressions) {
-        super(null);
+        super();
         this.shapeExpressions = expressions;
     }
 
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprRef.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprRef.java
index a1fb7cf4cbf..e2ed51b3e3b 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprRef.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprRef.java
@@ -32,7 +32,7 @@ public class ShapeExprRef extends ShapeExpression {
     private final Node ref;
 
     public ShapeExprRef(Node ref) {
-        super(null);
+        super();
         this.ref = ref;
     }
 
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTripleExpr.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTripleExpr.java
index c09ce56b139..a5357c6b3ca 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTripleExpr.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTripleExpr.java
@@ -22,7 +22,6 @@
 
 import org.apache.jena.atlas.io.IndentedWriter;
 import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
 import org.apache.jena.riot.out.NodeFormatter;
 import org.apache.jena.shex.eval.ShapeEval;
 import org.apache.jena.shex.sys.ValidationContext;
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTrue.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTrue.java
index 276dcf40d0d..87d0a799f5d 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTrue.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExprTrue.java
@@ -30,7 +30,7 @@
 public class ShapeExprTrue extends ShapeExpression {
 
     public ShapeExprTrue(int x) {
-        super(null);
+        super();
     }
 
     @Override
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExpression.java b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExpression.java
index 0f969eb6582..1e3d7851868 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExpression.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/expressions/ShapeExpression.java
@@ -20,12 +20,10 @@
 
 import org.apache.jena.atlas.io.IndentedWriter;
 import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
 import org.apache.jena.riot.out.NodeFormatter;
 import org.apache.jena.shex.sys.ValidationContext;
 
 import java.util.List;
-import java.util.Set;
 
 public abstract class ShapeExpression implements ShapeElement {
 
@@ -34,6 +32,7 @@ public abstract class ShapeExpression implements ShapeElement {
     public ShapeExpression(List<SemAct> semActs) {
         this.semActs = semActs;
     }
+
     protected ShapeExpression() { this(null); }
 
     public List<SemAct> getSemActs() {
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/TokenMgrError.java b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/TokenMgrError.java
index 33e4cf0e688..48fb27630e2 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/TokenMgrError.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/parser/javacc/TokenMgrError.java
@@ -123,11 +123,10 @@ protected static final String addEscapes(String str) {
    * Note: You can customize the lexical error message by modifying this method.
    */
   protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-    char curChar1 = (char)curChar;
     return("Lexical error at line " + //
           errorLine + ", column " + //
           errorColumn + ".  Encountered: " + //
-          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + (int)curChar + "),")) + //
+          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
           (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
           (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
   }
@@ -165,4 +164,4 @@ public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColu
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=21c287f1eb6de0eb264ee313fccf8645 (do not edit this line) */
+/* JavaCC - OriginalChecksum=be7511f73295200c6ceae68d8dabacd9 (do not edit this line) */
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/semact/SemanticActionPlugin.java b/jena-shex/src/main/java/org/apache/jena/shex/semact/SemanticActionPlugin.java
index e829fa66899..f0ebda332c1 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/semact/SemanticActionPlugin.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/semact/SemanticActionPlugin.java
@@ -32,6 +32,7 @@
 
 public interface SemanticActionPlugin extends Plugin {
 
+    @Override
     default void register() {
         List<String> uris = getUris();
         if(uris != null && !uris.isEmpty()) {
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/sys/SysShex.java b/jena-shex/src/main/java/org/apache/jena/shex/sys/SysShex.java
index 34cabf3f702..b38ec492a57 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/sys/SysShex.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/sys/SysShex.java
@@ -20,10 +20,8 @@
 
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.shex.Plugin;
 import org.apache.jena.shex.ShexValidator;
 import org.apache.jena.shex.semact.SemanticActionPlugin;
-import org.apache.jena.shex.semact.TestSemanticActionPlugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,7 +63,7 @@ public static ShexValidator get() {
     }
 
     public static ShexValidator getNew(Collection<SemanticActionPlugin> pz) {
-        Map iriToPlugin = new ConcurrentHashMap<>();
+        Map<String, SemanticActionPlugin> iriToPlugin = new ConcurrentHashMap<>();
         pz.forEach(p -> {
             p.getUris().forEach(u -> iriToPlugin.put(u, p));
         });
diff --git a/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java b/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java
index 8d1e2017b52..5f72ed7b19c 100644
--- a/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java
+++ b/jena-shex/src/main/java/org/apache/jena/shex/sys/ValidationContext.java
@@ -45,28 +45,16 @@ public class ValidationContext {
 
     private final ShexReport.Builder reportBuilder = ShexReport.create();
 
-
+    /** @deprecated Use method {@link #create()} */
     @Deprecated
     public static ValidationContext create(ValidationContext vCxt) {
-        // Fresh ShexReport.Builder
-        return new ValidationContext(vCxt, vCxt.data, vCxt.shapes, vCxt.inProgress, vCxt.semActPluginIndex);
+        return vCxt.create();
     }
 
-    /**
-     * Creates a new validation context with the current one as its parent context.
-     * Initializes the new context with the state of the parent context.
-     *
-     * @return new ValidationContext with this as parent.
-     */
-    public ValidationContext create() {
-        // Fresh ShexReport.Builder
-        return new ValidationContext(this, this.data, this.shapes, this.inProgress, this.semActPluginIndex);
+    public ValidationContext(Graph data, ShexSchema shapes) {
+        this(data, shapes, null);
     }
 
-//    public ValidationContext(Graph data, ShexSchema shapes) {
-//        this(data, shapes, null, null);
-//    }
-
     /**
      * Precondition: vCxt cannot be null
      *
@@ -80,10 +68,6 @@ public ValidationContext(Graph data, ShexSchema shapes, Map<String, SemanticActi
         this(null, data, shapes, null, semActPluginIndex);
     }
 
-//    private ValidationContext(Graph data, ShexSchema shapes ,Deque<Pair<Node, ShexShape>> progress) {
-//        this(data, shapes, progress, null);
-//    }
-
     private ValidationContext(ValidationContext parentCtx, Graph data, ShexSchema shapes, Deque<Pair<Node, ShexShape>> progress, Map<String, SemanticActionPlugin> semActPluginIndex) {
         this.parentCtx = parentCtx;
         this.data = data;
@@ -121,6 +105,17 @@ public Graph getData() {
         return data;
     }
 
+    /**
+     * Creates a new validation context with the current one as its parent context.
+     * Initializes the new context with the state of the parent context.
+     *
+     * @return new ValidationContext with this as parent.
+     */
+    public ValidationContext create() {
+        // Fresh ShexReport.Builder
+        return new ValidationContext(this, this.data, this.shapes, this.inProgress, this.semActPluginIndex);
+    }
+
     public void startValidate(ShexShape shape, Node data) {
         inProgress.push(Pair.create(data, shape));
     }
diff --git a/jena-shex/src/test/java/org/apache/jena/shex/TestShexPrintShexC.java b/jena-shex/src/test/java/org/apache/jena/shex/TestShexPrintShexC.java
index dbf848d5516..73033133401 100644
--- a/jena-shex/src/test/java/org/apache/jena/shex/TestShexPrintShexC.java
+++ b/jena-shex/src/test/java/org/apache/jena/shex/TestShexPrintShexC.java
@@ -20,11 +20,11 @@
 
 import org.apache.jena.arq.junit.runners.Directories;
 import org.apache.jena.arq.junit.runners.Label;
-import org.apache.jena.shex.runner.RunnerShexSyntax;
+import org.apache.jena.shex.runner.RunnerPrintShex;
 import org.junit.runner.RunWith;
 
-@RunWith(RunnerShexSyntax.class)
-@Label("Shex Syntax")
+@RunWith(RunnerPrintShex.class)
+@Label("Print ShexC")
 @Directories({
     "src/test/files/spec/syntax"
 })
diff --git a/jena-shex/src/test/java/org/apache/jena/shex/runner/RunnerPrintShex.java b/jena-shex/src/test/java/org/apache/jena/shex/runner/RunnerPrintShex.java
index 435d03c0d57..6e1e79ba85d 100644
--- a/jena-shex/src/test/java/org/apache/jena/shex/runner/RunnerPrintShex.java
+++ b/jena-shex/src/test/java/org/apache/jena/shex/runner/RunnerPrintShex.java
@@ -50,6 +50,11 @@ private static Set<String> excludes() {
         excludes.add("1refbnode_with_spanning_PN_CHARS_BASE1.shex");
         // Contains \u0d00 (ill-formed surrogate pair)
         excludes.add("_all.shex");
+
+        // Don't work - incomplete printing?
+        excludes.add("1literalPattern_with_all_controls.shex");
+        excludes.add("1literalPattern_with_ascii_boundaries.shex");
+
         return excludes;
     }
 
diff --git a/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java b/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
index 0412dbc0e31..073db20d79e 100644
--- a/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
+++ b/jena-shex/src/test/java/org/apache/jena/shex/runner/ShexValidationTest.java
@@ -26,8 +26,6 @@
 import org.apache.jena.atlas.lib.IRILib;
 import org.apache.jena.atlas.lib.InternalErrorException;
 import org.apache.jena.atlas.lib.Pair;
-import org.apache.jena.atlas.lib.tuple.Tuple;
-import org.apache.jena.base.Sys;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;
 import org.apache.jena.rdf.model.RDFNode;
@@ -38,7 +36,6 @@
 import org.apache.jena.shex.semact.TestSemanticActionPlugin;
 import org.apache.jena.shex.sys.ShexLib;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
index 8d50b1a8939..dbe7b4b6127 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/DatasetGraphTDB.java
@@ -26,7 +26,6 @@
 import org.apache.jena.dboe.base.file.Location;
 import org.apache.jena.dboe.storage.StoragePrefixes;
 import org.apache.jena.dboe.storage.system.DatasetGraphStorage;
-import org.apache.jena.dboe.sys.Names;
 import org.apache.jena.dboe.transaction.txn.TransactionalSystem;
 import org.apache.jena.graph.Graph;
 import org.apache.jena.graph.Node;