diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/base/MdxToQueryConverter.java b/common/src/main/java/org/eclipse/daanse/olap/query/base/MdxToQueryConverter.java
index e3bf478a..fcfcd30f 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/base/MdxToQueryConverter.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/base/MdxToQueryConverter.java
@@ -137,11 +137,11 @@ static QueryAxisImpl convertQueryAxis(Optional<SelectSlicerAxisClause> selectSli
 
     static List<QueryAxis> convertQueryAxisList(SelectQueryClause selectQueryClause) {
         switch (selectQueryClause) {
-        case SelectQueryAsteriskClause _UNNAMED:
+        case SelectQueryAsteriskClause _:
             return selectQueryAsteriskClauseToQueryAxisList();
         case SelectQueryAxesClause selectQueryAxesClause:
             return selectQueryAxesClauseToQueryAxisList(selectQueryAxesClause);
-        case SelectQueryEmptyClause _UNNAMES:
+        case SelectQueryEmptyClause _:
             return selectQueryEmptyClauseToQueryAxisList();
         }
     }
@@ -316,7 +316,7 @@ static Expression getExpressionByLiteral(Literal literal) {
             return NumericLiteralImpl.create(numericLiteral.value());
         case StringLiteral stringLiteral:
             return StringLiteralImpl.create(stringLiteral.value());
-        case NullLiteral _UNNAMED: // TODO: use Unnamed Pattern _
+        case NullLiteral _:
             return NullLiteralImpl.nullValue;
         case SymbolLiteral symbolLiteral:
             return SymbolLiteralImpl.create(symbolLiteral.value());
@@ -369,7 +369,7 @@ static Expression getExpressionByCallExpression(CallExpression callExpression) {
         case CaseOperationAtom coa:
             list = getExpressionList(callExpression.expressions());
             return new UnresolvedFunCallImpl(coa, list.stream().toArray(Expression[]::new));
-        case CastOperationAtom cast:
+        case CastOperationAtom _:
             list = getExpressionList(callExpression.expressions());
             return new UnresolvedFunCallImpl(new CastOperationAtom(), list.stream().toArray(Expression[]::new));
         }
@@ -444,13 +444,11 @@ static String convertName(NameObjectIdentifier nameObjectIdentifier) {
     }
 
     static String quoted(String name) {
-        StringBuilder sb = new StringBuilder();
-        return sb.append("[").append(name).append("]").toString();
+        return "[" + name + "]";
     }
 
     static String key(String name) {
-        StringBuilder sb = new StringBuilder();
-        return sb.append("&").append(name).append("]").toString();
+        return "&" + name + "]";
     }
 
 }
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/base/package-info.java b/common/src/main/java/org/eclipse/daanse/olap/query/base/package-info.java
index 301890fd..84ef07bc 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/base/package-info.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/base/package-info.java
@@ -11,7 +11,6 @@
 *   SmartCity Jena - initial
 *   Stefan Bischof (bipolis.org) - initial
 */
-//TODO: RM EXPORT
 @org.osgi.annotation.bundle.Export
 @org.osgi.annotation.versioning.Version("0.0.1")
 package org.eclipse.daanse.olap.query.base;
\ No newline at end of file
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java
index 81e87435..42880888 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/NamedSetExpressionImpl.java
@@ -105,7 +105,7 @@ public Expression accept(Validator validator) {
     }
 
     @Override
-	public Calc accept(ExpressionCompiler compiler) {
+	public Calc<?> accept(ExpressionCompiler compiler) {
         // This is a deliberate breach of the usual rules for interpreting
         // acceptable result styles. Usually the caller gets to call the shots:
         // the callee iterates over the acceptable styles and implements in the
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java
index 5dc5b135..45bdeeb7 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java
@@ -100,7 +100,7 @@ public Expression accept(Validator validator) {
     }
 
     @Override
-	public Calc accept(ExpressionCompiler compiler) {
+	public Calc<?> accept(ExpressionCompiler compiler) {
         return ((CompilableParameter) parameter).compile(compiler);
     }
 
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryAxisImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryAxisImpl.java
index a3c704e2..dd88e046 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryAxisImpl.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryAxisImpl.java
@@ -149,7 +149,7 @@ public Object accept(QueryComponentVisitor visitor) {
     }
 
     @Override
-    public Calc compile(ExpressionCompiler compiler, ResultStyle resultStyle) {
+    public Calc<?> compile(ExpressionCompiler compiler, ResultStyle resultStyle) {
         Expression expInner = this.exp;
         if (axisOrdinal.isFilter()) {
             expInner = normalizeSlicerExpression(expInner);
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java
index 17f8e242..5413b330 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java
@@ -191,8 +191,8 @@ public class QueryImpl extends AbstractQueryPart implements Query {
     private Subcube subcube;
 
     private final Statement statement;
-    public Calc[] axisCalcs;
-    public Calc slicerCalc;
+    public Calc<?>[] axisCalcs;
+    public Calc<?> slicerCalc;
 
     /**
      * Set of FunDefs for which alerts about non-native evaluation
@@ -1029,7 +1029,7 @@ private static Object quickParse(
                         .append(parameterName).append("', type ").append(type).toString());
             }
             List<Member> expList = new ArrayList<>();
-            final List list = (List) value;
+            final List<?> list = (List<?>) value;
             final SetType setType = (SetType) type;
             final Type elementType = setType.getElementType();
             for (Object o : list) {
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/expression/package-info.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/expression/package-info.java
index 3c63f9b9..e4f6af2c 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/expression/package-info.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/expression/package-info.java
@@ -11,7 +11,6 @@
 *   SmartCity Jena - initial
 *   Stefan Bischof (bipolis.org) - initial
 */
-//TODO: RM EXPORT
 @org.osgi.annotation.bundle.Export
 @org.osgi.annotation.versioning.Version("0.0.1")
 package org.eclipse.daanse.olap.query.component.expression;
\ No newline at end of file
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/package-info.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/package-info.java
index 26e5cd13..dd59016f 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/query/component/package-info.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/query/component/package-info.java
@@ -11,7 +11,6 @@
 *   SmartCity Jena - initial
 *   Stefan Bischof (bipolis.org) - initial
 */
-//TODO: RM EXPORT
 @org.osgi.annotation.bundle.Export
 @org.osgi.annotation.versioning.Version("0.0.1")
 package org.eclipse.daanse.olap.query.component;
\ No newline at end of file