diff --git a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java b/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java
index d81b8b691e3..77189de09a2 100644
--- a/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java
+++ b/mysql-storage/src/main/java/io/druid/storage/mysql/MySQLMetadataStorageModule.java
@@ -39,7 +39,6 @@ import io.druid.db.SQLMetadataSegmentManager;
 import io.druid.db.SQLMetadataSegmentManagerProvider;
 import io.druid.db.SQLMetadataSegmentPublisher;
 import io.druid.db.SQLMetadataSegmentPublisherProvider;
-import io.druid.db.SQLMetadataStorageActionHandler;
 import io.druid.db.SQLMetadataStorageActionHandlerFactory;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
@@ -47,7 +46,6 @@ import io.druid.guice.PolyBind;
 import io.druid.indexer.MetadataStorageUpdaterJobHandler;
 import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler;
 import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator;
-import io.druid.indexing.overlord.MetadataStorageActionHandler;
 import io.druid.indexing.overlord.MetadataStorageActionHandlerFactory;
 import io.druid.initialization.DruidModule;
 import io.druid.segment.realtime.SegmentPublisher;
diff --git a/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java b/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java
index 622947ad9ef..eda6a667ba8 100644
--- a/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java
+++ b/server/src/main/java/io/druid/guice/DerbyMetadataStorageDruidModule.java
@@ -23,27 +23,25 @@ import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provides;
+import io.druid.db.DerbyConnector;
+import io.druid.db.IndexerSQLMetadataStorageCoordinator;
+import io.druid.db.MetadataRuleManager;
+import io.druid.db.MetadataRuleManagerProvider;
+import io.druid.db.MetadataSegmentManager;
+import io.druid.db.MetadataSegmentManagerProvider;
+import io.druid.db.MetadataSegmentPublisherProvider;
+import io.druid.db.MetadataStorageConnector;
 import io.druid.db.SQLMetadataConnector;
 import io.druid.db.SQLMetadataRuleManager;
 import io.druid.db.SQLMetadataRuleManagerProvider;
 import io.druid.db.SQLMetadataSegmentManager;
 import io.druid.db.SQLMetadataSegmentManagerProvider;
-import io.druid.db.IndexerSQLMetadataStorageCoordinator;
-import io.druid.db.MetadataRuleManager;
-import io.druid.db.MetadataSegmentManager;
-import io.druid.db.MetadataSegmentManagerProvider;
-import io.druid.db.MetadataStorageConnector;
-import io.druid.db.MetadataSegmentPublisherProvider;
-import io.druid.db.MetadataRuleManagerProvider;
-import io.druid.db.DerbyConnector;
-import io.druid.db.SQLMetadataStorageActionHandler;
 import io.druid.db.SQLMetadataSegmentPublisher;
 import io.druid.db.SQLMetadataSegmentPublisherProvider;
 import io.druid.db.SQLMetadataStorageActionHandlerFactory;
-import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler;
 import io.druid.indexer.MetadataStorageUpdaterJobHandler;
+import io.druid.indexer.SQLMetadataStorageUpdaterJobHandler;
 import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator;
-import io.druid.indexing.overlord.MetadataStorageActionHandler;
 import io.druid.indexing.overlord.MetadataStorageActionHandlerFactory;
 import io.druid.segment.realtime.SegmentPublisher;
 import org.skife.jdbi.v2.IDBI;
@@ -83,7 +81,7 @@ public class DerbyMetadataStorageDruidModule implements Module
         binder, "druid.db.type", Key.get(IndexerMetadataStorageCoordinator.class), Key.get(IndexerSQLMetadataStorageCoordinator.class)
     );
     PolyBind.createChoice(
-        binder, "druid.db.type", Key.get(MetadataStorageActionHandler.class), Key.get(SQLMetadataStorageActionHandler.class)
+        binder, "druid.db.type", Key.get(MetadataStorageActionHandlerFactory.class), Key.get(SQLMetadataStorageActionHandlerFactory.class)
     );
     PolyBind.createChoice(
         binder, "druid.db.type", Key.get(MetadataStorageUpdaterJobHandler.class), Key.get(SQLMetadataStorageUpdaterJobHandler.class)
diff --git a/services/src/main/java/io/druid/cli/CliOverlord.java b/services/src/main/java/io/druid/cli/CliOverlord.java
index becf4faf7e4..aba2f0f0224 100644
--- a/services/src/main/java/io/druid/cli/CliOverlord.java
+++ b/services/src/main/java/io/druid/cli/CliOverlord.java
@@ -19,13 +19,11 @@
 
 package io.druid.cli;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
-import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.MapBinder;
 import com.google.inject.name.Names;
@@ -33,8 +31,6 @@ import com.google.inject.servlet.GuiceFilter;
 import com.google.inject.util.Providers;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Command;
-import io.druid.indexing.common.TaskStatus;
-import io.druid.db.IndexerSQLMetadataStorageCoordinator;
 import io.druid.guice.IndexingServiceFirehoseModule;
 import io.druid.guice.IndexingServiceModuleHelper;
 import io.druid.guice.IndexingServiceTaskLogsModule;
@@ -46,20 +42,15 @@ import io.druid.guice.LifecycleModule;
 import io.druid.guice.ListProvider;
 import io.druid.guice.ManageLifecycle;
 import io.druid.guice.PolyBind;
-import io.druid.indexing.common.TaskLock;
 import io.druid.indexing.common.actions.LocalTaskActionClientFactory;
-import io.druid.indexing.common.actions.TaskAction;
 import io.druid.indexing.common.actions.TaskActionClientFactory;
 import io.druid.indexing.common.actions.TaskActionToolbox;
 import io.druid.indexing.common.config.TaskConfig;
 import io.druid.indexing.common.config.TaskStorageConfig;
-import io.druid.indexing.common.task.Task;
 import io.druid.indexing.common.tasklogs.SwitchingTaskLogStreamer;
 import io.druid.indexing.common.tasklogs.TaskRunnerTaskLogStreamer;
 import io.druid.indexing.overlord.ForkingTaskRunnerFactory;
 import io.druid.indexing.overlord.HeapMemoryTaskStorage;
-import io.druid.indexing.overlord.IndexerMetadataStorageCoordinator;
-import io.druid.indexing.overlord.MetadataStorageActionHandlerTypes;
 import io.druid.indexing.overlord.MetadataTaskStorage;
 import io.druid.indexing.overlord.RemoteTaskRunnerFactory;
 import io.druid.indexing.overlord.TaskLockbox;
@@ -148,7 +139,6 @@ public class CliOverlord extends ServerRunnable
 
             binder.bind(TaskActionClientFactory.class).to(LocalTaskActionClientFactory.class).in(LazySingleton.class);
             binder.bind(TaskActionToolbox.class).in(LazySingleton.class);
-            binder.bind(IndexerMetadataStorageCoordinator.class).to(IndexerSQLMetadataStorageCoordinator.class).in(LazySingleton.class);
             binder.bind(TaskLockbox.class).in(LazySingleton.class);
             binder.bind(TaskStorageQueryAdapter.class).in(LazySingleton.class);
             binder.bind(ResourceManagementSchedulerFactory.class)