diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c
index dc59fcf9c..6276595f4 100644
--- a/src/jtag/drivers/cmsis_dap_usb.c
+++ b/src/jtag/drivers/cmsis_dap_usb.c
@@ -534,46 +534,6 @@ static int cmsis_dap_swd_write_reg(uint8_t cmd, uint32_t value)
 	return retval;
 }
 
-static int cmsis_dap_swd_read_block(uint8_t cmd, uint32_t blocksize, uint8_t *dest_buf)
-{
-	uint8_t *buffer;
-	int tfer_sz;
-	int retval = ERROR_OK;
-	uint16_t read_count;
-
-	DEBUG_IO("CMSIS-DAP: Read Block 0x%02" PRIx8 " %" PRIu32, cmd, blocksize);
-
-	while (blocksize) {
-
-		buffer = cmsis_dap_handle->packet_buffer;
-		tfer_sz = blocksize;
-		if (tfer_sz > 15)
-			tfer_sz = 8;
-
-		buffer[0] = 0;	/* report number */
-		buffer[1] = CMD_DAP_TFER_BLOCK;
-		buffer[2] = 0x00;
-		buffer[3] = tfer_sz;
-		buffer[4] = 0x00;
-		buffer[5] = cmd;
-		retval = cmsis_dap_usb_xfer(cmsis_dap_handle, 6);
-
-		read_count = le_to_h_u16(&buffer[1]);
-		if (read_count != tfer_sz) {
-			LOG_ERROR("CMSIS-DAP: Block Read Error (0x%02" PRIx8 ")", buffer[3]);
-			retval = buffer[3];
-		}
-
-		read_count *= 4;
-		memcpy(dest_buf, &buffer[4], read_count);
-
-		dest_buf += read_count;
-		blocksize -= tfer_sz;
-	}
-
-	return retval;
-}
-
 static int cmsis_dap_get_version_info(void)
 {
 	uint8_t *data;
@@ -1112,7 +1072,6 @@ static const struct swd_driver cmsis_dap_swd_driver = {
 	.init       = cmsis_dap_swd_init,
 	.read_reg   = cmsis_dap_swd_read_reg,
 	.write_reg  = cmsis_dap_swd_write_reg,
-	.read_block = cmsis_dap_swd_read_block
 };
 
 const char *cmsis_dap_transport[] = {"cmsis-dap", NULL};
diff --git a/src/jtag/swd.h b/src/jtag/swd.h
index fee7f912a..c628fa84b 100644
--- a/src/jtag/swd.h
+++ b/src/jtag/swd.h
@@ -66,7 +66,7 @@ static inline uint8_t swd_cmd(bool is_read, bool is_ap, uint8_t regnum)
 
 /*
  * FOR NOW  ... SWD driver ops are synchronous and return ACK
- * status ... no quueueing.
+ * status ... no queuing.
  *
  * Individual ops are request/response, and fast-fail permits much
  * better fault handling.  Upper layers may queue if desired.
@@ -110,18 +110,6 @@ struct swd_driver {
 	  */
 	 int (*write_reg)(uint8_t cmd, uint32_t value);
 
-	 /**
-	  * Synchronous block read of an AP or DP register.
-	  *
-	  * @param cmd with APnDP/RnW/addr/parity bits
-	  * @param number of reads from register to be executed
-	  * @param buffer to store data read from register
-	  *
-	  * @return SWD_ACK_* code for the transaction
-	  *		or (negative) fault code
-	  */
-	 int (*read_block)(uint8_t cmd, uint32_t blocksize, uint8_t *buffer);
-
 	/**
 	 * Configures data collection from the Single-wire
 	 * trace (SWO) signal.
diff --git a/src/target/adi_v5_cmsis_dap.c b/src/target/adi_v5_cmsis_dap.c
index 7df4cc783..95d1cea30 100644
--- a/src/target/adi_v5_cmsis_dap.c
+++ b/src/target/adi_v5_cmsis_dap.c
@@ -80,19 +80,6 @@ static int cmsis_dap_queue_dp_read(struct adiv5_dap *dap, unsigned reg, uint32_t
 	return retval;
 }
 
-static int cmsis_dap_queue_idcode_read(struct adiv5_dap *dap, uint8_t *ack, uint32_t *data)
-{
-	LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_idcode_read");
-
-	int retval = cmsis_dap_queue_dp_read(dap, DP_IDCODE, data);
-	if (retval != ERROR_OK)
-		return retval;
-
-	*ack = retval;
-
-	return ERROR_OK;
-}
-
 static int (cmsis_dap_queue_dp_write)(struct adiv5_dap *dap, unsigned reg, uint32_t data)
 {
 	LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_dp_write %d 0x%08" PRIx32, reg, data);
@@ -177,24 +164,6 @@ static int (cmsis_dap_queue_ap_write)(struct adiv5_dap *dap, unsigned reg, uint3
 	return retval;
 }
 
-static int (cmsis_dap_queue_ap_read_block)(struct adiv5_dap *dap, unsigned reg,
-		uint32_t blocksize, uint8_t *buffer)
-{
-	LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_ap_read_block 0x%08" PRIx32, blocksize);
-
-	int retval = jtag_interface->swd->read_block(
-			(CMSIS_CMD_AP | CMSIS_CMD_READ | CMSIS_CMD_A32(AP_REG_DRW)),
-			blocksize, buffer);
-
-	if (retval != ERROR_OK) {
-		/* fault response */
-		uint8_t ack = retval & 0xff;
-		cmsis_dap_queue_ap_abort(dap, &ack);
-	}
-
-	return retval;
-}
-
 /** Executes all queued DAP operations. */
 static int cmsis_dap_run(struct adiv5_dap *dap)
 {
@@ -206,12 +175,10 @@ static int cmsis_dap_run(struct adiv5_dap *dap)
 
 const struct dap_ops cmsis_dap_ops = {
 	.is_swd = true,
-	.queue_idcode_read   = cmsis_dap_queue_idcode_read,
 	.queue_dp_read       = cmsis_dap_queue_dp_read,
 	.queue_dp_write      = cmsis_dap_queue_dp_write,
 	.queue_ap_read       = cmsis_dap_queue_ap_read,
 	.queue_ap_write      = cmsis_dap_queue_ap_write,
-	.queue_ap_read_block = cmsis_dap_queue_ap_read_block,
 	.queue_ap_abort      = cmsis_dap_queue_ap_abort,
 	.run = cmsis_dap_run,
 };
@@ -309,9 +276,9 @@ static int cmsis_dap_init(struct command_context *ctx)
 	}
 #endif
 
-	uint8_t ack;
+	uint8_t ack = 0;
 
-	status = cmsis_dap_queue_idcode_read(dap, &ack, &idcode);
+	status = cmsis_dap_queue_dp_read(dap, DP_IDCODE, &idcode);
 
 	if (status == ERROR_OK)
 		LOG_INFO("IDCODE 0x%08" PRIx32, idcode);
diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index 7f61563f4..1100b17d2 100644
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -342,30 +342,6 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
 
 /*--------------------------------------------------------------------------*/
 
-static int jtag_idcode_q_read(struct adiv5_dap *dap,
-		uint8_t *ack, uint32_t *data)
-{
-	struct arm_jtag *jtag_info = dap->jtag_info;
-	int retval;
-	struct scan_field fields[1];
-
-	/* This is a standard JTAG operation -- no DAP tweakage */
-	retval = arm_jtag_set_instr(jtag_info, JTAG_DP_IDCODE, NULL, TAP_IDLE);
-	if (retval != ERROR_OK)
-		return retval;
-
-	fields[0].num_bits = 32;
-	fields[0].out_value = NULL;
-	fields[0].in_value = (uint8_t *) data;
-
-	jtag_add_dr_scan(jtag_info->tap, 1, fields, TAP_IDLE);
-
-	jtag_add_callback(arm_le_to_h_u32,
-			(jtag_callback_data_t) data);
-
-	return ERROR_OK;
-}
-
 static int jtag_dp_q_read(struct adiv5_dap *dap, unsigned reg,
 		uint32_t *data)
 {
@@ -420,40 +396,6 @@ static int jtag_ap_q_write(struct adiv5_dap *dap, unsigned reg,
 	return adi_jtag_ap_write_check(dap, reg, out_value_buf);
 }
 
-static int jtag_ap_q_read_block(struct adiv5_dap *dap, unsigned reg,
-		uint32_t blocksize, uint8_t *buffer)
-{
-	uint32_t readcount;
-	int retval = ERROR_OK;
-
-	/* Scan out first read */
-	retval = adi_jtag_dp_scan(dap, JTAG_DP_APACC, reg,
-			DPAP_READ, 0, NULL, NULL);
-	if (retval != ERROR_OK)
-		return retval;
-
-	for (readcount = 0; readcount < blocksize - 1; readcount++) {
-		/* Scan out next read; scan in posted value for the
-		 * previous one.  Assumes read is acked "OK/FAULT",
-		 * and CTRL_STAT says that meant "OK".
-		 */
-		retval = adi_jtag_dp_scan(dap, JTAG_DP_APACC, reg,
-				DPAP_READ, 0, buffer + 4 * readcount,
-				&dap->ack);
-		if (retval != ERROR_OK)
-			return retval;
-	}
-
-	/* Scan in last posted value; RDBUFF has no other effect,
-	 * assuming ack is OK/FAULT and CTRL_STAT says "OK".
-	 */
-	retval = adi_jtag_dp_scan(dap, JTAG_DP_DPACC, DP_RDBUFF,
-			DPAP_READ, 0, buffer + 4 * readcount,
-			&dap->ack);
-
-	return retval;
-}
-
 static int jtag_ap_q_abort(struct adiv5_dap *dap, uint8_t *ack)
 {
 	/* for JTAG, this is the only valid ABORT register operation */
@@ -470,12 +412,10 @@ static int jtag_dp_run(struct adiv5_dap *dap)
  * part of DAP setup
 */
 const struct dap_ops jtag_dp_ops = {
-	.queue_idcode_read   = jtag_idcode_q_read,
 	.queue_dp_read       = jtag_dp_q_read,
 	.queue_dp_write      = jtag_dp_q_write,
 	.queue_ap_read       = jtag_ap_q_read,
 	.queue_ap_write      = jtag_ap_q_write,
-	.queue_ap_read_block = jtag_ap_q_read_block,
 	.queue_ap_abort      = jtag_ap_q_abort,
 	.run                 = jtag_dp_run,
 };
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index c78aef27a..4c9897394 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -121,16 +121,6 @@ static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
 	return retval;
 }
 
-static int swd_queue_idcode_read(struct adiv5_dap *dap,
-		uint8_t *ack, uint32_t *data)
-{
-	int status = swd_queue_dp_read(dap, DP_IDCODE, data);
-	if (status < 0)
-		return status;
-	*ack = status;
-	/* ?? */
-	return ERROR_OK;
-}
 
 static int (swd_queue_dp_write)(struct adiv5_dap *dap, unsigned reg,
 		uint32_t data)
@@ -240,7 +230,6 @@ static int swd_run(struct adiv5_dap *dap)
 const struct dap_ops swd_dap_ops = {
 	.is_swd = true,
 
-	.queue_idcode_read = swd_queue_idcode_read,
 	.queue_dp_read = swd_queue_dp_read,
 	.queue_dp_write = swd_queue_dp_write,
 	.queue_ap_read = swd_queue_ap_read,
@@ -460,7 +449,7 @@ static int swd_init(struct command_context *ctx)
 
 	uint8_t ack;
 
-	status = swd_queue_idcode_read(dap, &ack, &idcode);
+	status = swd_queue_dp_read(dap, DP_IDCODE, &idcode);
 
 	if (status == ERROR_OK)
 		LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode);
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index c51e8f81b..09b6b0d74 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -220,7 +220,7 @@ struct adiv5_dap {
  * both JTAG and SWD transports.  All submitted transactions are logically
  * queued, until the queue is executed by run().  Some implementations might
  * execute transactions as soon as they're submitted, but no status is made
- * availablue until run().
+ * available until run().
  */
 struct dap_ops {
 	/** If the DAP transport isn't SWD, it must be JTAG.  Upper level
@@ -228,10 +228,6 @@ struct dap_ops {
 	 */
 	bool	is_swd;
 
-	/** Reads the DAP's IDCODe register. */
-	int (*queue_idcode_read)(struct adiv5_dap *dap,
-			uint8_t *ack, uint32_t *data);
-
 	/** DP register read. */
 	int (*queue_dp_read)(struct adiv5_dap *dap, unsigned reg,
 			uint32_t *data);
@@ -245,9 +241,6 @@ struct dap_ops {
 	/** AP register write. */
 	int (*queue_ap_write)(struct adiv5_dap *dap, unsigned reg,
 			uint32_t data);
-	/** AP read block. */
-	int (*queue_ap_read_block)(struct adiv5_dap *dap, unsigned reg,
-			uint32_t blocksize, uint8_t *buffer);
 
 	/** AP operation abort. */
 	int (*queue_ap_abort)(struct adiv5_dap *dap, uint8_t *ack);
@@ -265,24 +258,6 @@ enum ap_type {
 	AP_TYPE_JTAG_AP = 0x10   /* JTAG-AP - JTAG master for controlling other JTAG devices */
 };
 
-/**
- * Queue an IDCODE register read.  This is primarily useful for SWD
- * transports, where it is required as part of link initialization.
- * (For JTAG, this register is read as part of scan chain setup.)
- *
- * @param dap The DAP used for reading.
- * @param ack Pointer to where transaction status will be stored.
- * @param data Pointer saying where to store the IDCODE value.
- *
- * @return ERROR_OK for success, else a fault code.
- */
-static inline int dap_queue_idcode_read(struct adiv5_dap *dap,
-		uint8_t *ack, uint32_t *data)
-{
-	assert(dap->ops != NULL);
-	return dap->ops->queue_idcode_read(dap, ack, data);
-}
-
 /**
  * Queue a DP register read.
  * Note that not all DP registers are readable; also, that JTAG and SWD
@@ -353,24 +328,6 @@ static inline int dap_queue_ap_write(struct adiv5_dap *dap,
 	return dap->ops->queue_ap_write(dap, reg, data);
 }
 
-/**
- * Queue an AP block read.
- *
- * @param dap The DAP used for reading.
- * @param reg The number of the AP register being read.
- * @param blocksize The number of the AP register being read.
- * @param buffer Pointer saying where to store the data
- * (in host endianness).
- *
- * @return ERROR_OK for success, else a fault code.
- */
-static inline int dap_queue_ap_read_block(struct adiv5_dap *dap,
-		unsigned reg, unsigned blocksize, uint8_t *buffer)
-{
-	assert(dap->ops != NULL);
-	return dap->ops->queue_ap_read_block(dap, reg, blocksize, buffer);
-}
-
 /**
  * Queue an AP abort operation.  The current AP transaction is aborted,
  * including any update of the transaction counter.  The AP is left in