diff --git a/src/target/arm11.c b/src/target/arm11.c
index 289d64c05721ab33bcf6933f6dbb62af0f517d13..1e82b9389b91f08c310fea48a51e78d0c650c0b3 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -97,7 +97,6 @@ target_type_t arm11_target =
 	ARM11_HANDLER(target_create),
 	ARM11_HANDLER(init_target),
 	ARM11_HANDLER(examine),
-	ARM11_HANDLER(quit),
 };
 
 int arm11_regs_arch_type = -1;
@@ -1904,12 +1903,6 @@ int arm11_examine(struct target_s *target)
 	return ERROR_OK;
 }
 
-int arm11_quit(void)
-{
-	FNC_INFO_NOTIMPLEMENTED;
-
-	return ERROR_OK;
-}
 
 /** Load a register that is marked !valid in the register cache */
 int arm11_get_reg(reg_t *reg)
diff --git a/src/target/arm11.h b/src/target/arm11.h
index 9afff23d7ce6be7a3775877cef12cf0794dee8df..67320de7b295cbe04502030a8dcaee6fed05adc9 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -230,7 +230,6 @@ int arm11_run_algorithm(struct target_s *target, int num_mem_params, mem_param_t
 int arm11_register_commands(struct command_context_s *cmd_ctx);
 int arm11_target_create(struct target_s *target, Jim_Interp *interp);
 int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm11_quit(void);
 
 /* helpers */
 int arm11_build_reg_cache(target_t *target);
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 6ed66cd626c29d8d9b7cc3edc3b492e1b8d3d6fc..c18291af6efd3f613d676a1d4fe3b6c58efe701e 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -41,7 +41,6 @@ int arm720t_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, ch
 /* forward declarations */
 int arm720t_target_create(struct target_s *target,Jim_Interp *interp);
 int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm720t_quit(void);
 int arm720t_arch_state(struct target_s *target);
 int arm720t_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm720t_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
@@ -88,7 +87,6 @@ target_type_t arm720t_target =
 	.target_create = arm720t_target_create,
 	.init_target = arm720t_init_target,
 	.examine = arm7tdmi_examine,
-	.quit = arm720t_quit,
 	.mrc = arm720t_mrc,
 	.mcr = arm720t_mcr,
 
@@ -469,10 +467,6 @@ int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_s *targ
 	return ERROR_OK;
 }
 
-int arm720t_quit(void)
-{
-	return ERROR_OK;
-}
 
 int arm720t_init_arch_info(target_t *target, arm720t_common_t *arm720t, jtag_tap_t *tap)
 {
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 253bdf08353b7e56abfca57477c64bcdcf6d4e64..ec7b4f9ec2d044d1685bee3a9884041a7d420396 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -38,7 +38,6 @@
 /* forward declarations */
 
 int arm7tdmi_target_create(struct target_s *target,Jim_Interp *interp);
-int arm7tdmi_quit(void);
 
 /* target function declarations */
 int arm7tdmi_poll(struct target_s *target);
@@ -80,7 +79,6 @@ target_type_t arm7tdmi_target =
 	.target_create  = arm7tdmi_target_create,
 	.init_target = arm7tdmi_init_target,
 	.examine = arm7tdmi_examine,
-	.quit = arm7tdmi_quit
 };
 
 int arm7tdmi_examine_debug_reason(target_t *target)
@@ -758,11 +756,6 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-int arm7tdmi_quit(void)
-{
-	return ERROR_OK;
-}
-
 int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap)
 {
 	armv4_5_common_t *armv4_5;
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index a332db0bd82271f3c0c905b87532c5e55e3301e2..835e4ee16435b506e81f56e8fa9c3d8264b5683a 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -43,7 +43,6 @@ int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, char *cmd
 /* forward declarations */
 int arm920t_target_create(struct target_s *target, Jim_Interp *interp);
 int arm920t_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm920t_quit(void);
 
 #define ARM920T_CP15_PHYS_ADDR(x, y, z) ((x << 5) | (y << 1) << (z))
 
@@ -85,7 +84,6 @@ target_type_t arm920t_target =
 	.target_create = arm920t_target_create,
 	.init_target = arm920t_init_target,
 	.examine = arm9tdmi_examine,
-	.quit = arm920t_quit
 };
 
 int arm920t_read_cp15_physical(target_t *target, int reg_addr, uint32_t *value)
@@ -659,11 +657,6 @@ int arm920t_init_target(struct command_context_s *cmd_ctx, struct target_s *targ
 	return ERROR_OK;
 }
 
-int arm920t_quit(void)
-{
-	return ERROR_OK;
-}
-
 int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap_t *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 608a7edfb16da2f068662cb57999a327ff86df87..ee24f5c307c1c48ac1d7147667b65e4469d70804 100644
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -740,11 +740,6 @@ static int arm926ejs_init_target(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int arm926ejs_quit(void)
-{
-	return ERROR_OK;
-}
-
 int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs,
 		jtag_tap_t *tap)
 {
@@ -978,7 +973,6 @@ target_type_t arm926ejs_target =
 	.target_create = arm926ejs_target_create,
 	.init_target = arm926ejs_init_target,
 	.examine = arm9tdmi_examine,
-	.quit = arm926ejs_quit,
 	.virt2phys = arm926ejs_virt2phys,
 	.mmu = arm926ejs_mmu,
 
diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index badcd4f226158e839adffbe70c00ddf216399567..c06562c5d28e05a4d037f1f40e51f401f46933c4 100644
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -35,7 +35,6 @@
 /* forward declarations */
 int arm966e_target_create(struct target_s *target, Jim_Interp *interp);
 int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm966e_quit(void);
 
 target_type_t arm966e_target =
 {
@@ -73,7 +72,6 @@ target_type_t arm966e_target =
 	.target_create = arm966e_target_create,
 	.init_target = arm966e_init_target,
 	.examine = arm9tdmi_examine,
-	.quit = arm966e_quit,
 };
 
 int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
@@ -83,11 +81,6 @@ int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *targ
 	return ERROR_OK;
 }
 
-int arm966e_quit(void)
-{
-	return ERROR_OK;
-}
-
 int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap)
 {
 	arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index ac233f6631401a68706550d7e65823085e293361..72a24b4c8bb38d412c8637dd3f4ec0f0d6901fd6 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -47,7 +47,6 @@
 
 /* forward declarations */
 static int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp);
-static int arm9tdmi_quit(void);
 
 target_type_t arm9tdmi_target =
 {
@@ -85,7 +84,6 @@ target_type_t arm9tdmi_target =
 	.target_create = arm9tdmi_target_create,
 	.init_target = arm9tdmi_init_target,
 	.examine = arm9tdmi_examine,
-	.quit = arm9tdmi_quit
 };
 
 static arm9tdmi_vector_t arm9tdmi_vectors[] =
@@ -859,11 +857,6 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-static int arm9tdmi_quit(void)
-{
-	return ERROR_OK;
-}
-
 int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
 {
 	armv4_5_common_t *armv4_5;
diff --git a/src/target/avrt.c b/src/target/avrt.c
index 2b73c32e16cb76b2e3b78b251ccef9d182ffed82..d3e6282bbf44672a7e25e53ab76f51432c93dffc 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -34,7 +34,6 @@ int avr_register_commands(struct command_context_s *cmd_ctx);
 /* forward declarations */
 int avr_target_create(struct target_s *target, Jim_Interp *interp);
 int avr_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int avr_quit(void);
 
 int avr_arch_state(struct target_s *target);
 int avr_poll(target_t *target);
@@ -95,7 +94,6 @@ target_type_t avr_target =
 	.register_commands = avr_register_commands,
 	.target_create = avr_target_create,
 	.init_target = avr_init_target,
-	.quit = avr_quit,
 /*
 	.virt2phys = avr_virt2phys,
 	.mmu = avr_mmu
@@ -124,12 +122,6 @@ int avr_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
 	return ERROR_OK;
 }
 
-int avr_quit(void)
-{
-	LOG_DEBUG("%s", __FUNCTION__);
-	return ERROR_OK;
-}
-
 int avr_arch_state(struct target_s *target)
 {
 	LOG_DEBUG("%s", __FUNCTION__);
diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index e716999063748cee01c69bb728287d36f4c5180a..11068ba2a0c46f5145220fef1625404412de3ff9 100644
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -106,7 +106,6 @@ target_type_t cortexa8_target =
 	.target_create = cortex_a8_target_create,
 	.init_target = cortex_a8_init_target,
 	.examine = cortex_a8_examine,
-	.quit = NULL
 };
 
 /*
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index e854f6b6560c174dff1aa227e5f7c9f0e3bc3ff2..ff9779209834ad98d91973eb0b181e82830061ed 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1498,11 +1498,6 @@ static int cortex_m3_examine(struct target_s *target)
 	return ERROR_OK;
 }
 
-static int cortex_m3_quit(void)
-{
-	return ERROR_OK;
-}
-
 static int cortex_m3_dcc_read(swjdp_common_t *swjdp, uint8_t *value, uint8_t *ctrl)
 {
 	uint16_t dcrdr;
@@ -1843,6 +1838,5 @@ target_type_t cortexm3_target =
 	.target_create = cortex_m3_target_create,
 	.init_target = cortex_m3_init_target,
 	.examine = cortex_m3_examine,
-	.quit = cortex_m3_quit
 };
 
diff --git a/src/target/fa526.c b/src/target/fa526.c
index 9cdbf3d4344e204f5e11b9dd064cf9c04b8a1f2d..4f8c3b20d90b48f7238c226d444e3e2d20d9a8b8 100644
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -36,7 +36,6 @@
 
 int fa526_target_create(struct target_s *target, Jim_Interp *interp);
 int fa526_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int fa526_quit(void);
 
 target_type_t fa526_target =
 {
@@ -74,7 +73,6 @@ target_type_t fa526_target =
 	.target_create = fa526_target_create,
 	.init_target = fa526_init_target,
 	.examine = arm9tdmi_examine,
-	.quit = fa526_quit
 };
 
 void fa526_change_to_arm(target_t *target, uint32_t *r0, uint32_t *pc)
@@ -422,8 +420,3 @@ int fa526_init_target(struct command_context_s *cmd_ctx, struct target_s *target
 	arm9tdmi_init_target(cmd_ctx, target);
 	return ERROR_OK;
 }
-
-int fa526_quit(void)
-{
-	return ERROR_OK;
-}
diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index f084201ee4c83cbddbda9c97d1a27c33a031c70f..e1dc068642f70b75dde83ffe3d6d2820585f3bb9 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -583,11 +583,6 @@ int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-int feroceon_quit(void)
-{
-	return ERROR_OK;
-}
-
 void feroceon_common_setup(struct target_s *target)
 {
 	armv4_5_common_t *armv4_5 = target->arch_info;
@@ -715,7 +710,6 @@ target_type_t feroceon_target =
 	.target_create = feroceon_target_create,
 	.init_target = feroceon_init_target,
 	.examine = feroceon_examine,
-	.quit = feroceon_quit
 };
 
 target_type_t dragonite_target =
@@ -754,6 +748,5 @@ target_type_t dragonite_target =
 	.target_create = dragonite_target_create,
 	.init_target = feroceon_init_target,
 	.examine = feroceon_examine,
-	.quit = feroceon_quit
 };
 
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 6458c260c0f0fc81cb88b2eea5fd14ad9f1d6abe..07731a0a50d3b0312e3ec8380f0d7b4b2280bd48 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -41,7 +41,6 @@ int mips_m4k_read_memory(struct target_s *target, uint32_t address, uint32_t siz
 int mips_m4k_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int mips_m4k_register_commands(struct command_context_s *cmd_ctx);
 int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int mips_m4k_quit(void);
 int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp);
 
 int mips_m4k_examine(struct target_s *target);
@@ -85,7 +84,6 @@ target_type_t mips_m4k_target =
 	.target_create = mips_m4k_target_create,
 	.init_target = mips_m4k_init_target,
 	.examine = mips_m4k_examine,
-	.quit = mips_m4k_quit
 };
 
 int mips_m4k_examine_debug_reason(target_t *target)
@@ -919,11 +917,6 @@ int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 	return ERROR_OK;
 }
 
-int mips_m4k_quit(void)
-{
-	return ERROR_OK;
-}
-
 int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, jtag_tap_t *tap)
 {
 	mips32_common_t *mips32 = &mips_m4k->mips32_common;
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 83baa2526a3fe60f45222f6322d20e15d55a9b87..dd469db10788af5764500c829bba7cd07f930ed3 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -178,7 +178,6 @@ struct target_type_s
 	 * before the JTAG chain has been examined/verified
 	 * */
 	int (*init_target)(struct command_context_s *cmd_ctx, struct target_s *target);
-	int (*quit)(void);
 
 	/* translate from virtual to physical address. Default implementation is successful
 	 * no-op(i.e. virtual==physical).
diff --git a/src/target/xscale.c b/src/target/xscale.c
index ee9d88d6463f14b3aed92e74fe49ae6e4e13e8aa..cc4176b61e1b3e66a8392fbf491546695fbc4088 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -2919,12 +2919,6 @@ static int xscale_init_target(struct command_context_s *cmd_ctx,
 	return ERROR_OK;
 }
 
-static int xscale_quit(void)
-{
-	jtag_add_runtest(100, TAP_RESET);
-	return ERROR_OK;
-}
-
 static int xscale_init_arch_info(target_t *target,
 		xscale_common_t *xscale, jtag_tap_t *tap, const char *variant)
 {
@@ -3734,7 +3728,6 @@ target_type_t xscale_target =
 	.register_commands = xscale_register_commands,
 	.target_create = xscale_target_create,
 	.init_target = xscale_init_target,
-	.quit = xscale_quit,
 
 	.virt2phys = xscale_virt2phys,
 	.mmu = xscale_mmu