diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 319760a890aa263f7136954556aebe695a414b23..779923ec1d9941e5a51d0ed7f1af2e48bc4b687e 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -512,7 +512,6 @@ void ft2232_end_state(tap_state_t state)
 	}
 }
 
-
 static void ft2232_read_scan(enum scan_type type, u8* buffer, int scan_size)
 {
 	int num_bytes = (scan_size + 7) / 8;
@@ -1412,20 +1411,6 @@ static void sheevaplug_reset(int trst, int srst)
 	LOG_DEBUG("trst: %i, srst: %i, high_output: 0x%2.2x, high_direction: 0x%2.2x", trst, srst, high_output, high_direction);
 }
 
-static int ft2232_execute_end_state(jtag_command_t *cmd)
-{
-	int  retval;
-	retval = ERROR_OK;
-
-	DEBUG_JTAG_IO("execute_end_state: %s", tap_state_name(cmd->cmd.end_state->end_state) );
-
-	if (cmd->cmd.end_state->end_state != TAP_INVALID)
-		ft2232_end_state(cmd->cmd.end_state->end_state);
-
-	return retval;
-}
-
-
 static int ft2232_execute_runtest(jtag_command_t *cmd)
 {
 	int  retval;
@@ -1682,7 +1667,6 @@ static int ft2232_execute_command(jtag_command_t *cmd)
 
 	switch (cmd->type)
 	{
-	case JTAG_END_STATE: 	retval = ft2232_execute_end_state(cmd); break;
 	case JTAG_RESET:	 		retval = ft2232_execute_reset(cmd); break;
 	case JTAG_RUNTEST:   	retval = ft2232_execute_runtest(cmd); break;
 	case JTAG_STATEMOVE: 	retval = ft2232_execute_statemove(cmd); break;
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 9ad096880482f2e50cb2b729e86fc98eb975731b..af4c64da4e0c095b0d7fa3012dccfb95cdc050e9 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -348,7 +348,6 @@ enum jtag_command_type {
 	JTAG_STATEMOVE    = 2,
 	JTAG_RUNTEST      = 3,
 	JTAG_RESET        = 4,
-	JTAG_END_STATE    = 5,
 	JTAG_PATHMOVE     = 6,
 	JTAG_SLEEP        = 7,
 	JTAG_STABLECLOCKS = 8