[06/11] Remove htm_* options

diff --git a/src/htm.c b/src/htm.c
index f0073548a3..e5e29f5e0b 100644
--- a/src/htm.c
+++ b/src/htm.c
@@ -380,98 +380,3 @@  int run_htm(int optind, int argc, char *argv[])
 
 	return rc;
 }
-
-/*
- * Handle the deprecated commands by telling the user what the new
- * command is.
- */
-int run_htm_start(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest start\n");
-
-	return 0;
-}
-
-int run_htm_stop(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest stop\n");
-
-	return 0;
-}
-
-int run_htm_status(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest status\n");
-
-	return 0;
-}
-
-int run_htm_reset(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest reset\n");
-
-	return 0;
-}
-
-int run_htm_dump(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest dump\n");
-
-	return 0;
-}
-
-int run_htm_trace(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest trace\n");
-
-	return 0;
-}
-
-int run_htm_analyse(int optind, int argc, char *argv[])
-{
-	int i;
-
-	fprintf(stderr, "You're running a deprecated command!\n");
-	fprintf(stderr, "Please use:\n");
-	for (i = 0; i < optind; i++)
-		fprintf(stderr, "%s ", argv[i]);
-	fprintf(stderr, "htm nest analyse\n");
-
-	return 0;
-}
diff --git a/src/htm.h b/src/htm.h
index f5ffa7689f..21e7b77744 100644
--- a/src/htm.h
+++ b/src/htm.h
@@ -16,12 +16,4 @@ 
 #include <inttypes.h>
 #include <stdio.h>
 
-int run_htm_start(int optind, int argc, char *argv[]);
-int run_htm_stop(int optind, int argc, char *argv[]);
-int run_htm_status(int optind, int argc, char *argv[]);
-int run_htm_reset(int optind, int argc, char *argv[]);
-int run_htm_dump(int optind, int argc, char *argv[]);
-int run_htm_trace(int optind, int argc, char *argv[]);
-int run_htm_analyse(int optind, int argc, char *argv[]);
-
 int run_htm(int optind, int argc, char *argv[]);
diff --git a/src/main.c b/src/main.c
index 1422c3f7bb..ad725ec1d2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -100,13 +100,6 @@  static struct action actions[] = {
 	{ "start",   "", "Start thread", &thread_start },
 	{ "step",    "<count>", "Set a thread <count> instructions", &thread_step },
 	{ "stop",    "", "Stop thread", &thread_stop },
-	{ "htm_start", "", "[deprecated use 'htm nest start'] Start Nest HTM", &run_htm_start },
-	{ "htm_stop", "", "[deprecated use 'htm nest stop'] Stop Nest HTM", &run_htm_stop },
-	{ "htm_status", "", "[deprecated use 'htm nest status'] Print the status of HTM", &run_htm_status },
-	{ "htm_reset", "", "[deprecated use 'htm nest reset'] Reset the HTM facility", &run_htm_reset },
-	{ "htm_dump", "", "[deprecated use 'htm nest dump'] Dump HTM buffer to file", &run_htm_dump },
-	{ "htm_trace", "" , "[deprecated use 'htm nest trace'] Configure and start tracing with HTM", &run_htm_trace },
-	{ "htm_analyse", "", "[derepcated use 'htm nest analyse'] Stop and dump buffer to file", &run_htm_analyse },
 	{ "htm", "core|nest start|stop|status|reset|dump|trace|analyse", "Hardware Trace Macro", &run_htm },
 	{ "release", "", "Should be called after pdbg work is finished, to release special wakeups and other resources.", &handle_release},
 	{ "probe", "", "", &handle_probe },