diff --git a/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java b/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
index 8dc5ff240b..15ddf71826 100644
--- a/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
+++ b/core/src/main/java/io/bitsquare/common/taskrunner/TaskRunner.java
@@ -21,7 +21,6 @@ import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -33,7 +32,7 @@ public class TaskRunner<T extends Model> {
 
     private final Queue<Class<? extends Task>> tasks = new LinkedBlockingQueue<>();
     protected final T sharedModel;
-    private final Class<? extends Model> sharedModelClass;
+    private final Class<T> sharedModelClass;
     private final ResultHandler resultHandler;
     private final ErrorMessageHandler errorMessageHandler;
     private boolean failed = false;
@@ -43,19 +42,18 @@ public class TaskRunner<T extends Model> {
 
 
     public TaskRunner(T sharedModel, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        this(sharedModel, sharedModel.getClass(), resultHandler, errorMessageHandler);
+        this(sharedModel, (Class<T>) sharedModel.getClass(), resultHandler, errorMessageHandler);
     }
 
-    public TaskRunner(T sharedModel, Class<? extends Model> sharedModelClass, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+    public TaskRunner(T sharedModel, Class<T> sharedModelClass, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
         this.sharedModel = sharedModel;
         this.resultHandler = resultHandler;
         this.errorMessageHandler = errorMessageHandler;
         this.sharedModelClass = sharedModelClass;
     }
 
-    public final void addTasks(Class<? extends Task<? extends Model>>... items) {
-        List<Class<? extends Task<? extends Model>>> list = Arrays.asList(items);
-        tasks.addAll(list);
+    public final void addTasks(Class<? extends Task<T>>... items) {
+        tasks.addAll(Arrays.asList(items));
     }
 
     public void run() {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTaskRunner.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTaskRunner.java
index 81c083aada..b822550f70 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTaskRunner.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeTaskRunner.java
@@ -19,18 +19,12 @@ package io.bitsquare.trade.protocol.trade;
 
 import io.bitsquare.common.handlers.ErrorMessageHandler;
 import io.bitsquare.common.handlers.ResultHandler;
-import io.bitsquare.common.taskrunner.Model;
 import io.bitsquare.common.taskrunner.TaskRunner;
 import io.bitsquare.trade.Trade;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class TradeTaskRunner extends TaskRunner<Trade> {
-    private static final Logger log = LoggerFactory.getLogger(TradeTaskRunner.class);
 
     public TradeTaskRunner(Trade sharedModel, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
-        super(sharedModel, (Class<? extends Model>) sharedModel.getClass().getSuperclass().getSuperclass(), resultHandler, errorMessageHandler);
+        super(sharedModel, (Class<Trade>) sharedModel.getClass().getSuperclass().getSuperclass(), resultHandler, errorMessageHandler);
     }
-
 }