diff --git a/tool/playground/ExtractInheritance.java b/tool/playground/ExtractInheritance.java
index 29d97b1c9..5ef0f8e28 100644
--- a/tool/playground/ExtractInheritance.java
+++ b/tool/playground/ExtractInheritance.java
@@ -18,7 +18,7 @@ public class ExtractInheritance extends JavaLRBaseListener {
 	 */
 	@Override
 	public void enterNormalClassDeclaration(JavaLRParser.NormalClassDeclarationContext ctx) {
-		TerminalNode<Token> id = ctx.Identifier();
+		TerminalNode id = ctx.Identifier();
 		String sup = null;
 		if ( ctx.type()!=null ) {
 			sup = ctx.type().getText();
@@ -41,7 +41,7 @@ public class ExtractInheritance extends JavaLRBaseListener {
 
 	@Override
 	public void enterNormalInterfaceDeclaration(JavaLRParser.NormalInterfaceDeclarationContext ctx) {
-		TerminalNode<Token> id = ctx.Identifier();
+		TerminalNode id = ctx.Identifier();
 		System.out.println("###### interface "+id);
 		String args = null;
 		if ( ctx.typeList()!=null ) {
diff --git a/tool/playground/GenHierarchy.java b/tool/playground/GenHierarchy.java
index 19222574f..0dc1f0df3 100644
--- a/tool/playground/GenHierarchy.java
+++ b/tool/playground/GenHierarchy.java
@@ -26,7 +26,7 @@ public class GenHierarchy {
 			JavaLRLexer lexer = new JavaLRLexer(input);
 			CommonTokenStream tokens = new CommonTokenStream(lexer);
 			JavaLRParser parser = new JavaLRParser(tokens);
-			ParserRuleContext<Token> tree = parser.compilationUnit(); // parse
+			ParserRuleContext tree = parser.compilationUnit(); // parse
 
 			ParseTreeWalker walker = new ParseTreeWalker(); // create standard walker
 			ExtractInheritance extractor = new ExtractInheritance(parser);
diff --git a/tool/playground/TestJava.java b/tool/playground/TestJava.java
index b4151d94b..290521410 100644
--- a/tool/playground/TestJava.java
+++ b/tool/playground/TestJava.java
@@ -129,7 +129,7 @@ class TestJava {
 				if ( diag ) parser.addErrorListener(new DiagnosticErrorListener());
 				if ( SLL ) parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
 				// start parsing at the compilationUnit rule
-				ParserRuleContext<Token> tree = parser.compilationUnit();
+				ParserRuleContext tree = parser.compilationUnit();
 				if ( showTree ) tree.inspect(parser);
 				if ( printTree ) System.out.println(tree.toStringTree(parser));
 
diff --git a/tool/playground/TestJavaLR.java b/tool/playground/TestJavaLR.java
index 1964deb82..41b5598c7 100644
--- a/tool/playground/TestJavaLR.java
+++ b/tool/playground/TestJavaLR.java
@@ -263,7 +263,7 @@ class TestJavaLR {
 			if ( SLL ) parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
 
 			// start parsing at the compilationUnit rule
-			ParserRuleContext<Token> t = parser.compilationUnit();
+			ParserRuleContext t = parser.compilationUnit();
 			if ( notree ) parser.setBuildParseTree(false);
 			if ( gui ) t.inspect(parser);
 			if ( printTree ) System.out.println(t.toStringTree(parser));