diff --git a/agent/agent_consul.go b/agent/agent_consul.go
index 563d4c16..e1d2f1a3 100644
--- a/agent/agent_consul.go
+++ b/agent/agent_consul.go
@@ -37,50 +37,6 @@ func startConsul(fs *flags, t *transporterServer) error {
 
 	var flags []string
 	switch t.req.DatabaseID {
-	case dbtesterpb.DatabaseID_consul__v0_7_5:
-		switch t.req.IPIndex {
-		case 0: // leader
-			flags = []string{
-				"agent",
-				"-server",
-				"-data-dir", fs.consulDataDir,
-				"-bind", peerIPs[t.req.IPIndex],
-				"-client", peerIPs[t.req.IPIndex],
-				"-bootstrap-expect", fmt.Sprintf("%d", len(peerIPs)),
-			}
-		default:
-			flags = []string{
-				"agent",
-				"-server",
-				"-data-dir", fs.consulDataDir,
-				"-bind", peerIPs[t.req.IPIndex],
-				"-client", peerIPs[t.req.IPIndex],
-				"-join", peerIPs[0],
-			}
-		}
-
-	case dbtesterpb.DatabaseID_consul__v0_8_0:
-		switch t.req.IPIndex {
-		case 0: // leader
-			flags = []string{
-				"agent",
-				"-server",
-				"-data-dir", fs.consulDataDir,
-				"-bind", peerIPs[t.req.IPIndex],
-				"-client", peerIPs[t.req.IPIndex],
-				"-bootstrap-expect", fmt.Sprintf("%d", len(peerIPs)),
-			}
-		default:
-			flags = []string{
-				"agent",
-				"-server",
-				"-data-dir", fs.consulDataDir,
-				"-bind", peerIPs[t.req.IPIndex],
-				"-client", peerIPs[t.req.IPIndex],
-				"-join", peerIPs[0],
-			}
-		}
-
 	case dbtesterpb.DatabaseID_consul__v0_8_4:
 		switch t.req.IPIndex {
 		case 0: // leader
diff --git a/agent/agent_etcd.go b/agent/agent_etcd.go
index 28635128..d8fa8f9f 100644
--- a/agent/agent_etcd.go
+++ b/agent/agent_etcd.go
@@ -23,7 +23,7 @@ import (
 	"github.com/coreos/dbtester/dbtesterpb"
 )
 
-// startEtcd starts etcd v2 and v3.
+// startEtcd starts etcd v3.
 func startEtcd(fs *flags, t *transporterServer) error {
 	if !exist(fs.etcdExec) {
 		return fmt.Errorf("etcd binary %q does not exist", globalFlags.etcdExec)
@@ -48,24 +48,6 @@ func startEtcd(fs *flags, t *transporterServer) error {
 
 	var flags []string
 	switch t.req.DatabaseID {
-	case dbtesterpb.DatabaseID_etcd__v2_3:
-		flags = []string{
-			"--name", names[t.req.IPIndex],
-			"--data-dir", fs.etcdDataDir,
-
-			"--snapshot-count", fmt.Sprintf("%d", t.req.Flag_Etcd_Tip.SnapshotCount),
-
-			"--listen-client-urls", clientURLs[t.req.IPIndex],
-			"--advertise-client-urls", clientURLs[t.req.IPIndex],
-
-			"--listen-peer-urls", peerURLs[t.req.IPIndex],
-			"--initial-advertise-peer-urls", peerURLs[t.req.IPIndex],
-
-			"--initial-cluster-token", "mytoken",
-			"--initial-cluster", strings.Join(members, ","),
-			"--initial-cluster-state", "new",
-		}
-
 	case dbtesterpb.DatabaseID_etcd__v3_1:
 		flags = []string{
 			"--name", names[t.req.IPIndex],
diff --git a/agent/server.go b/agent/server.go
index 0c7a3ad9..e181b96a 100644
--- a/agent/server.go
+++ b/agent/server.go
@@ -100,7 +100,8 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques
 		plog.Infof("system metrics CSV path: %q", globalFlags.systemMetricsCSV)
 
 		switch req.DatabaseID {
-		case dbtesterpb.DatabaseID_etcd__v2_3,
+		case dbtesterpb.DatabaseID_etcd__v3_1,
+			dbtesterpb.DatabaseID_etcd__v3_2,
 			dbtesterpb.DatabaseID_etcd__tip:
 			plog.Infof("etcd executable binary path: %q", globalFlags.etcdExec)
 			plog.Infof("etcd data directory: %q", globalFlags.etcdDataDir)
@@ -112,9 +113,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques
 			plog.Infof("Zookeeper data directory: %q", globalFlags.zkDataDir)
 			plog.Infof("Zookeeper configuration path: %q", globalFlags.zkConfig)
 
-		case dbtesterpb.DatabaseID_consul__v0_7_5,
-			dbtesterpb.DatabaseID_consul__v0_8_0,
-			dbtesterpb.DatabaseID_consul__v0_8_4:
+		case dbtesterpb.DatabaseID_consul__v0_8_4:
 			plog.Infof("Consul executable binary path: %q", globalFlags.consulExec)
 			plog.Infof("Consul data directory: %q", globalFlags.consulDataDir)
 
@@ -139,8 +138,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques
 	switch req.Operation {
 	case dbtesterpb.Operation_Start:
 		switch t.req.DatabaseID {
-		case dbtesterpb.DatabaseID_etcd__v2_3,
-			dbtesterpb.DatabaseID_etcd__v3_1,
+		case dbtesterpb.DatabaseID_etcd__v3_1,
 			dbtesterpb.DatabaseID_etcd__v3_2,
 			dbtesterpb.DatabaseID_etcd__tip,
 			dbtesterpb.DatabaseID_zetcd__beta,
@@ -184,9 +182,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques
 				plog.Errorf("startZookeeper error %v", err)
 				return nil, err
 			}
-		case dbtesterpb.DatabaseID_consul__v0_7_5,
-			dbtesterpb.DatabaseID_consul__v0_8_0,
-			dbtesterpb.DatabaseID_consul__v0_8_4:
+		case dbtesterpb.DatabaseID_consul__v0_8_4:
 			if err := startConsul(&globalFlags, t); err != nil {
 				plog.Errorf("startConsul error %v", err)
 				return nil, err
@@ -289,26 +285,18 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques
 
 func measureDatabasSize(flg flags, rdb dbtesterpb.DatabaseID) (int64, error) {
 	switch rdb {
-	case dbtesterpb.DatabaseID_etcd__v2_3:
+	case dbtesterpb.DatabaseID_etcd__v3_1,
+		dbtesterpb.DatabaseID_etcd__v3_2,
+		dbtesterpb.DatabaseID_etcd__tip,
+		dbtesterpb.DatabaseID_cetcd__beta,
+		dbtesterpb.DatabaseID_zetcd__beta:
 		return fileinspect.Size(flg.etcdDataDir)
-	case dbtesterpb.DatabaseID_etcd__tip:
-		return fileinspect.Size(flg.etcdDataDir)
-	case dbtesterpb.DatabaseID_zookeeper__r3_4_9:
+	case dbtesterpb.DatabaseID_zookeeper__r3_4_9,
+		dbtesterpb.DatabaseID_zookeeper__r3_5_2_alpha,
+		dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta:
 		return fileinspect.Size(flg.zkDataDir)
-	case dbtesterpb.DatabaseID_zookeeper__r3_5_2_alpha:
-		return fileinspect.Size(flg.zkDataDir)
-	case dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta:
-		return fileinspect.Size(flg.zkDataDir)
-	case dbtesterpb.DatabaseID_consul__v0_7_5:
-		return fileinspect.Size(flg.consulDataDir)
-	case dbtesterpb.DatabaseID_consul__v0_8_0:
-		return fileinspect.Size(flg.consulDataDir)
 	case dbtesterpb.DatabaseID_consul__v0_8_4:
 		return fileinspect.Size(flg.consulDataDir)
-	case dbtesterpb.DatabaseID_cetcd__beta:
-		return fileinspect.Size(flg.etcdDataDir)
-	case dbtesterpb.DatabaseID_zetcd__beta:
-		return fileinspect.Size(flg.etcdDataDir)
 	default:
 		return 0, fmt.Errorf("uknown %q", rdb)
 	}