diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/Util.java b/common/src/main/java/org/eclipse/daanse/olap/common/Util.java
index bf74b08..b1fff50 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/common/Util.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/common/Util.java
@@ -132,8 +132,8 @@
 import org.eclipse.daanse.olap.exceptions.MdxCantFindMemberException;
 import org.eclipse.daanse.olap.exceptions.MdxChildObjectNotFoundException;
 import org.eclipse.daanse.olap.exceptions.MemberNotFoundException;
-import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.eclipse.daanse.olap.execution.ExecutionCatalogReaderWrapper;
+import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.eclipse.daanse.olap.fun.FunUtil;
 import org.eclipse.daanse.olap.fun.sort.Sorter;
 import org.eclipse.daanse.olap.function.def.member.validmeasure.ValidMeasureFunDef;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/fun/sort/Sorter.java b/common/src/main/java/org/eclipse/daanse/olap/fun/sort/Sorter.java
index e76e39f..4bc2e85 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/fun/sort/Sorter.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/fun/sort/Sorter.java
@@ -30,7 +30,6 @@
 import static org.eclipse.daanse.olap.common.Util.DOUBLE_NULL;
 import static org.eclipse.daanse.olap.common.Util.newInternal;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.AbstractList;
 import java.util.ArrayList;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java b/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java
index 4035176..48ef705 100644
--- a/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java
+++ b/common/src/main/java/org/eclipse/daanse/olap/impl/StatementImpl.java
@@ -29,6 +29,8 @@
 import org.eclipse.daanse.olap.api.element.OlapElement;
 import org.eclipse.daanse.olap.api.exception.OlapRuntimeException;
 import org.eclipse.daanse.olap.api.execution.ExecutionContext;
+import org.eclipse.daanse.olap.api.execution.QueryCanceledException;
+import org.eclipse.daanse.olap.api.execution.QueryTimeoutException;
 import org.eclipse.daanse.olap.api.query.component.DrillThrough;
 import org.eclipse.daanse.olap.api.query.component.Explain;
 import org.eclipse.daanse.olap.api.query.component.Query;
@@ -36,8 +38,6 @@
 import org.eclipse.daanse.olap.api.result.Cell;
 import org.eclipse.daanse.olap.api.result.CellSet;
 import org.eclipse.daanse.olap.api.result.Result;
-import org.eclipse.daanse.olap.api.execution.QueryCanceledException;
-import org.eclipse.daanse.olap.api.execution.QueryTimeoutException;
 import org.eclipse.daanse.olap.common.ExecuteDurationUtil;
 import org.eclipse.daanse.olap.connection.ConnectionBase;
 import org.eclipse.daanse.olap.execution.ExecutionImpl;
diff --git a/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java b/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java
index 6ce09e2..cfc21ee 100644
--- a/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java
+++ b/common/src/test/java/org/eclipse/daanse/olap/fun/sort/SorterTest.java
@@ -52,9 +52,9 @@
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections;
 import org.eclipse.daanse.olap.connection.ConnectionBase;
+import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.eclipse.daanse.olap.function.def.member.memberorderkey.MemberOrderKeyCalc;
 import org.eclipse.daanse.olap.query.component.QueryImpl;
-import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java
index cd1c62f..96f053d 100644
--- a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java
+++ b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/CrossJoinTest.java
@@ -48,6 +48,7 @@
 import org.eclipse.daanse.olap.api.calc.todo.TupleList;
 import org.eclipse.daanse.olap.api.connection.Connection;
 import org.eclipse.daanse.olap.api.element.Member;
+import org.eclipse.daanse.olap.api.execution.ExecutionContext;
 import org.eclipse.daanse.olap.api.function.FunctionDefinition;
 import org.eclipse.daanse.olap.api.function.FunctionMetaData;
 import org.eclipse.daanse.olap.api.function.FunctionParameter;
@@ -62,11 +63,10 @@
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.ArrayTupleList;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList;
 import org.eclipse.daanse.olap.common.SystemWideProperties;
+import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.eclipse.daanse.olap.function.core.FunctionParameterR;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
-import org.eclipse.daanse.olap.api.execution.ExecutionContext;
 import org.eclipse.daanse.olap.api.execution.ExecutionMetadata;
-import org.eclipse.daanse.olap.execution.ExecutionImpl;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/TestMember.java b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/TestMember.java
index 9fff726..ddf90c0 100644
--- a/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/TestMember.java
+++ b/common/src/test/java/org/eclipse/daanse/olap/function/def/crossjoin/TestMember.java
@@ -26,9 +26,11 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.eclipse.daanse.olap.api.MatchType;
 import org.eclipse.daanse.olap.api.CatalogReader;
+import org.eclipse.daanse.olap.api.MatchType;
 import org.eclipse.daanse.olap.api.Segment;
+import org.eclipse.daanse.olap.api.element.Catalog;
+import org.eclipse.daanse.olap.api.element.Cube;
 import org.eclipse.daanse.olap.api.element.Dimension;
 import org.eclipse.daanse.olap.api.element.DimensionType;
 import org.eclipse.daanse.olap.api.element.Hierarchy;
@@ -36,8 +38,6 @@
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.api.element.MetaData;
 import org.eclipse.daanse.olap.api.element.OlapElement;
-import org.eclipse.daanse.olap.api.element.Catalog;
-import org.eclipse.daanse.olap.api.element.Cube;
 import org.eclipse.daanse.olap.api.query.component.Expression;
 import org.eclipse.daanse.olap.element.AbstractProperty;
 
diff --git a/common/src/test/java/org/eclipse/daanse/olap/function/def/iif/IifFunDefTest.java b/common/src/test/java/org/eclipse/daanse/olap/function/def/iif/IifFunDefTest.java
index c07b9fd..b5a32ab 100644
--- a/common/src/test/java/org/eclipse/daanse/olap/function/def/iif/IifFunDefTest.java
+++ b/common/src/test/java/org/eclipse/daanse/olap/function/def/iif/IifFunDefTest.java
@@ -24,19 +24,16 @@
 
 package org.eclipse.daanse.olap.function.def.iif;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.assertj.core.api.Assertions;
 import org.eclipse.daanse.olap.api.calc.Calc;
 import org.eclipse.daanse.olap.api.calc.ResultStyle;
 import org.eclipse.daanse.olap.api.calc.compiler.ExpressionCompiler;
 import org.eclipse.daanse.olap.api.function.FunctionDefinition;
 import org.eclipse.daanse.olap.api.query.component.Expression;
 import org.eclipse.daanse.olap.api.type.SetType;
-import org.eclipse.daanse.olap.function.def.iif.IifSetResolver;
 import org.eclipse.daanse.olap.function.def.set.SetListCalc;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentCache.java b/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentCache.java
index d2684f9..726d3a6 100644
--- a/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentCache.java
+++ b/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentCache.java
@@ -26,8 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.daanse.olap.common.SystemWideProperties;
-
 /**
  * SPI definition of the segments cache.
  *
diff --git a/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentColumn.java b/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentColumn.java
index f4dd3c3..9b5eeb9 100644
--- a/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentColumn.java
+++ b/spi/src/main/java/org/eclipse/daanse/olap/spi/SegmentColumn.java
@@ -28,7 +28,6 @@
 import java.util.SortedSet;
 
 import org.eclipse.daanse.olap.common.Util;
-
 import  org.eclipse.daanse.olap.util.ArraySortedSet;
 
 
diff --git a/spi/src/main/java/org/eclipse/daanse/olap/spi/StatisticsProvider.java b/spi/src/main/java/org/eclipse/daanse/olap/spi/StatisticsProvider.java
index 3256891..114e9df 100644
--- a/spi/src/main/java/org/eclipse/daanse/olap/spi/StatisticsProvider.java
+++ b/spi/src/main/java/org/eclipse/daanse/olap/spi/StatisticsProvider.java
@@ -24,9 +24,7 @@
 
 package org.eclipse.daanse.olap.spi;
 
-import org.eclipse.daanse.jdbc.db.dialect.api.Dialect;
 import org.eclipse.daanse.olap.api.Context;
-
 import org.eclipse.daanse.olap.execution.ExecutionImpl;
 
 /**