diff --git a/common-api/src/main/java/com/mz/reactor/ddd/common/api/command/Command.java b/common-api/src/main/java/com/mz/reactor/ddd/common/api/command/Command.java
index ba4c676..8d913b4 100644
--- a/common-api/src/main/java/com/mz/reactor/ddd/common/api/command/Command.java
+++ b/common-api/src/main/java/com/mz/reactor/ddd/common/api/command/Command.java
@@ -3,8 +3,6 @@ package com.mz.reactor.ddd.common.api.command;
 import com.mz.reactor.ddd.common.api.Message;
 import org.immutables.value.Value;
 
-import java.time.Instant;
-import java.util.Optional;
 import java.util.UUID;
 
 public interface Command extends Message {
diff --git a/common-api/src/main/java/com/mz/reactor/ddd/common/api/event/DomainEvent.java b/common-api/src/main/java/com/mz/reactor/ddd/common/api/event/DomainEvent.java
index 7b74e95..2d3dc20 100644
--- a/common-api/src/main/java/com/mz/reactor/ddd/common/api/event/DomainEvent.java
+++ b/common-api/src/main/java/com/mz/reactor/ddd/common/api/event/DomainEvent.java
@@ -3,8 +3,6 @@ package com.mz.reactor.ddd.common.api.event;
 import com.mz.reactor.ddd.common.api.Message;
 import org.immutables.value.Value;
 
-import java.time.Instant;
-import java.util.Optional;
 import java.util.UUID;
 
 public interface DomainEvent extends Message {
diff --git a/common-api/src/main/java/com/mz/reactor/ddd/common/api/valueobject/Money.java b/common-api/src/main/java/com/mz/reactor/ddd/common/api/valueobject/Money.java
index 14bfcf0..987a69b 100644
--- a/common-api/src/main/java/com/mz/reactor/ddd/common/api/valueobject/Money.java
+++ b/common-api/src/main/java/com/mz/reactor/ddd/common/api/valueobject/Money.java
@@ -2,7 +2,6 @@ package com.mz.reactor.ddd.common.api.valueobject;
 
 import java.math.BigDecimal;
 import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
 
diff --git a/common-components/src/main/java/com/mz/reactor/ddd/common/components/bus/impl/ApplicationMessageBusImpl.java b/common-components/src/main/java/com/mz/reactor/ddd/common/components/bus/impl/ApplicationMessageBusImpl.java
index a8039ca..0f89678 100644
--- a/common-components/src/main/java/com/mz/reactor/ddd/common/components/bus/impl/ApplicationMessageBusImpl.java
+++ b/common-components/src/main/java/com/mz/reactor/ddd/common/components/bus/impl/ApplicationMessageBusImpl.java
@@ -4,12 +4,10 @@ import com.mz.reactor.ddd.common.api.Message;
 import com.mz.reactor.ddd.common.components.bus.ApplicationMessageBus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.DirectProcessor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
-import reactor.core.publisher.ReplayProcessor;
 import reactor.core.scheduler.Schedulers;
 
 import java.util.Optional;
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
index 1d65355..f12cca5 100644
--- a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
+++ b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateActor.java
@@ -2,7 +2,6 @@ package com.mz.reactor.ddd.reactorddd.persistance.aggregate;
 
 import com.mz.reactor.ddd.common.api.command.Command;
 import com.mz.reactor.ddd.common.api.command.CommandResult;
-import com.mz.reactor.ddd.common.api.event.DomainEvent;
 import reactor.core.publisher.Mono;
 
 import java.util.function.Function;
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
index 98ba0f2..1665d8e 100644
--- a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
+++ b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateFacade.java
@@ -4,8 +4,6 @@ import com.mz.reactor.ddd.common.api.command.Command;
 import com.mz.reactor.ddd.common.api.event.DomainEvent;
 import reactor.core.publisher.Mono;
 
-import java.util.stream.Stream;
-
 public interface AggregateFacade<A, C extends Command,S> {
 
   Mono<S> execute(C command, String aggregateID);
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
index d37bc20..f1674ae 100644
--- a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
+++ b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/AggregateRepository.java
@@ -2,7 +2,6 @@ package com.mz.reactor.ddd.reactorddd.persistance.aggregate;
 
 import com.mz.reactor.ddd.common.api.command.Command;
 import com.mz.reactor.ddd.common.api.command.CommandResult;
-import com.mz.reactor.ddd.common.api.event.DomainEvent;
 import com.mz.reactor.ddd.common.api.valueobject.Id;
 import reactor.core.publisher.Mono;
 
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
index 07a8f23..6459f0a 100644
--- a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
+++ b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateFacadeImpl.java
@@ -13,7 +13,6 @@ import reactor.core.publisher.Mono;
 
 import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 
 public class AggregateFacadeImpl<A, C extends Command, S> implements AggregateFacade<A, C, S> {
diff --git a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
index 4cc835c..70ecaa7 100644
--- a/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
+++ b/common-persistence/src/main/java/com/mz/reactor/ddd/reactorddd/persistance/view/impl/impl/ViewRepositoryImpl.java
@@ -6,7 +6,6 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.UnicastProcessor;
-import reactor.core.scheduler.Schedulers;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
index 4547d8a..4916fb7 100644
--- a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
+++ b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/AggregateActorTest.java
@@ -10,8 +10,6 @@ import reactor.test.StepVerifier;
 import java.util.List;
 import java.util.UUID;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 class AggregateActorTest {
 
   @Test
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
index 81dcfd7..bb530c7 100644
--- a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
+++ b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/aggregate/impl/TestAggregateEvent.java
@@ -4,7 +4,6 @@ import com.mz.reactor.ddd.common.api.event.DomainEvent;
 
 import java.time.Instant;
 import java.util.Optional;
-import java.util.UUID;
 
 public class TestAggregateEvent implements DomainEvent {
 
diff --git a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
index b09cf5c..b7b3f2e 100644
--- a/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
+++ b/common-persistence/src/test/java/com/mz/reactor/ddd/reactorddd/persistance/model/TestView.java
@@ -2,7 +2,6 @@ package com.mz.reactor.ddd.reactorddd.persistance.model;
 
 import com.mz.reactor.ddd.common.api.view.DomainView;
 
-import java.time.Instant;
 import java.util.Optional;
 
 public class TestView implements DomainView {