diff --git a/tests/dumpcaps.c b/tests/dumpcaps.c
index fa76f6ded..5400d20fc 100644
--- a/tests/dumpcaps.c
+++ b/tests/dumpcaps.c
@@ -3,7 +3,7 @@
  * This programs dumps the capabilities of a backend rig.
  *
  *
- *    $Id: dumpcaps.c,v 1.28 2001-08-08 06:08:33 f4cfe Exp $  
+ *    $Id: dumpcaps.c,v 1.29 2001-09-20 21:21:14 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -49,22 +49,6 @@ int main (int argc, char *argv[])
 			exit(1);
 	}
 
-#if 0
-  	status = rig_load_backend("icom");
-	status |= rig_load_backend("ft747");
-	status |= rig_load_backend("ft847");
-	status |= rig_load_backend("kenwood");
-	status |= rig_load_backend("aor");
-	status |= rig_load_backend("pcr");
-	rig_load_backend("winradio");   /* may not be compiled ... */
-	rig_load_backend("dummy");
-
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(status));
-		exit(3);
-	}
-#endif
-
 	rig_model = atoi(argv[1]);
 	
 	rig_check_backend(rig_model);
diff --git a/tests/dumpmem.c b/tests/dumpmem.c
index 74dd7cfb1..61ffa5d16 100644
--- a/tests/dumpmem.c
+++ b/tests/dumpmem.c
@@ -3,7 +3,7 @@
  * This programs dumps the mmeory contents of a rig.
  *
  *
- *    $Id: dumpmem.c,v 1.5 2001-07-25 21:59:55 f4cfe Exp $  
+ *    $Id: dumpmem.c,v 1.6 2001-09-20 21:21:14 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -45,22 +45,6 @@ int main (int argc, char *argv[])
 			exit(1);
 	}
 
-#if 0
-  	status = rig_load_backend("icom");
-	status |= rig_load_backend("ft747");
-	status |= rig_load_backend("ft847");
-	status |= rig_load_backend("kenwood");
-	status |= rig_load_backend("aor");
-	status |= rig_load_backend("pcr");
-	rig_load_backend("winradio");   /* may not be compiled in ... */
-	rig_load_backend("dummy");
-
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(status));
-		exit(3);
-	}
-#endif
-
   	my_rig = rig_init(atoi(argv[1]));
 
 	if (!my_rig) {
diff --git a/tests/listrigs.c b/tests/listrigs.c
index 25fecae84..7dc6295aa 100644
--- a/tests/listrigs.c
+++ b/tests/listrigs.c
@@ -3,7 +3,7 @@
  * This programs list all the available the rig capabilities.
  *
  *
- *    $Id: listrigs.c,v 1.10 2001-08-08 06:08:33 f4cfe Exp $  
+ *    $Id: listrigs.c,v 1.11 2001-09-20 21:21:14 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -97,41 +97,6 @@ int main (int argc, char *argv[])
 { 
 	int status;
 
-#if 0
-	status = rig_load_backend("icom");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("yaesu");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: yaesu error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("kenwood");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: kenwood error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("aor");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: aor error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("pcr");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: pcr error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("alinco");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: alinco error = %s \n", rigerror(status));
-		exit(3);
-	}
-	rig_load_backend("winradio");	/* may not be compiled .. */
-	rig_load_backend("dummy");
-#endif
-
 	rig_load_all_backends();
 
 	printf("Rig#\tMfg\tModel       \tVers.\tStatus\tType\n");
diff --git a/tests/rigmatrix.c b/tests/rigmatrix.c
index 843f95e2e..81d888a3b 100644
--- a/tests/rigmatrix.c
+++ b/tests/rigmatrix.c
@@ -4,7 +4,7 @@
  * The code is rather ugly since this is only a try out.
  *
  *
- *    $Id: rigmatrix.c,v 1.15 2001-08-08 06:08:33 f4cfe Exp $  
+ *    $Id: rigmatrix.c,v 1.16 2001-09-20 21:21:14 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -316,9 +316,6 @@ int print_caps_level(const struct rig_caps *caps, void *data)
 	print_yn(level & RIG_LEVEL_AGC);
 	print_yn(level & RIG_LEVEL_BKINDL);
 	print_yn(level & RIG_LEVEL_BALANCE);
-#if 0
-	print_yn(level & RIG_LEVEL_ANN);	/* deprecated */
-#endif
 
 	/* get only levels */
 	print_yn(level & RIG_LEVEL_SWR);
@@ -538,41 +535,6 @@ int main (int argc, char *argv[])
 	time_t gentime;
 	int set_or_get;
 
-#if 0
-	status = rig_load_backend("icom");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("ft747");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: ft747 error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("ft847");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: ft847 error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("kenwood");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: kenwood error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("aor");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: aor error = %s \n", rigerror(status));
-		exit(3);
-	}
-	status = rig_load_backend("pcr");
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: pcr error = %s \n", rigerror(status));
-		exit(3);
-	}
-	rig_load_backend("winradio");	/* may not be compiled ... */
-	rig_load_backend("dummy");
-#endif
-
 	rig_load_all_backends();
 
 
diff --git a/tests/testcaps.c b/tests/testcaps.c
index 2955c4b19..8cab7842c 100644
--- a/tests/testcaps.c
+++ b/tests/testcaps.c
@@ -4,7 +4,7 @@
  * like the passband info..
  *
  *
- *    $Id: testcaps.c,v 1.3 2001-07-13 19:08:15 f4cfe Exp $  
+ *    $Id: testcaps.c,v 1.4 2001-09-20 21:21:14 f4cfe Exp $  
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -46,22 +46,6 @@ int main (int argc, char *argv[])
 			exit(1);
 	}
 
-#if 0
-  	status = rig_load_backend("icom");
-	status |= rig_load_backend("ft747");
-	status |= rig_load_backend("ft847");
-	status |= rig_load_backend("kenwood");
-	status |= rig_load_backend("aor");
-	status |= rig_load_backend("pcr");
-	rig_load_backend("winradio");   /* may not be compiled ... */
-	rig_load_backend("dummy");
-
-	if (status != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(status));
-		exit(3);
-	}
-#endif
-
 	pbrig = rig_init(atoi(argv[1]));
 	if (!pbrig) {
 			fprintf(stderr,"Unknown rig num: %d\n",atoi(argv[1]));
diff --git a/tests/testtrn.c b/tests/testtrn.c
index 9f47737e1..1a93aa43e 100644
--- a/tests/testtrn.c
+++ b/tests/testtrn.c
@@ -34,14 +34,6 @@ int main (int argc, char *argv[])
 	 * allocate memory, setup & open port 
 	 */
 
-#if 0
-	retcode = rig_load_backend("icom");
-	if (retcode != RIG_OK ) {
-		printf("rig_load_backend: error = %s \n", rigerror(retcode));
-		exit(3);
-	}
-#endif
-
 	my_rig = rig_init(atoi(argv[1]));
 	if (!my_rig) {
 			fprintf(stderr,"Unknown rig num: %d\n",atoi(argv[1]));