diff --git a/TODO b/TODO
index 335b7c61061d2f13b1f67f3d68e2565c18e1da60..2b2bb40545e4a87485099631e7b6ced9ac4f3e79 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,2 @@
-- Additional cores. ARM9E(J)-S, ARM7TDMI-S, TI925, ...
-- Testing.
-- Additional jtag interfaces. Currently, only Wiggler style interfaces and
-  USBJTAG-1 are supported.
-- Testing.
-- Handle endianess. The configuration variable is there, but that's about it.
-  Currently, only little-endian targets and little-endian hosts are supported.
+This document is not in use. See mailing list.
+
diff --git a/src/target/target.c b/src/target/target.c
index feddc1c0fe7b726edffc85ba52b510fa4b7e245e..377bb0dc07dbd9f9c9ea4dd19cdc8787778fd46d 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1577,24 +1577,11 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 	target_t *target = get_current_target(cmd_ctx);
 
 	DEBUG("-");
-	
-	command_print(cmd_ctx, "requesting target halt...");
 
 	if ((retval = target->type->halt(target)) != ERROR_OK)
-	{	
-		switch (retval)
 		{
-			case ERROR_TARGET_ALREADY_HALTED:
-				command_print(cmd_ctx, "target already halted");
-				break;
-			case ERROR_TARGET_TIMEOUT:
-				command_print(cmd_ctx, "target timed out... shutting down");
-				return retval;
-			default:
-				command_print(cmd_ctx, "unknown error... shutting down");
 				return retval;
 		}
-	}
 	
 	return handle_wait_halt_command(cmd_ctx, cmd, args, argc);
 }