diff --git a/src/amp_conf.c b/src/amp_conf.c
index cfd71e6e8..9651f5238 100644
--- a/src/amp_conf.c
+++ b/src/amp_conf.c
@@ -472,8 +472,6 @@ int frontamp_get_conf2(AMP *amp, token_t token, char *val, int val_len)
  */
 
 
-#ifdef XXREMOVEDXXC
-// Not referenced anywhere
 /**
  * \brief Executes cfunc on all the elements stored in the configuration
  * parameters table.
@@ -534,7 +532,6 @@ int HAMLIB_API amp_token_foreach(AMP *amp,
 
     return RIG_OK;
 }
-#endif
 
 
 /**
diff --git a/src/neverused.c b/src/neverused.c
index 891e52bc9..004c589c0 100644
--- a/src/neverused.c
+++ b/src/neverused.c
@@ -23,7 +23,6 @@ void never_used()
     amp_ext_token_lookup();
     amp_probe_all();
     amp_set_powerstat();
-    amp_token_foreach();
     amp_unregister();
     cm108_dcd_get();
     CtrlHandler();
diff --git a/tests/ampctl.c b/tests/ampctl.c
index a4cac10c0..ee0a79d42 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -320,8 +320,6 @@ int main(int argc, char *argv[])
         my_amp->state.ampport_deprecated.parm.serial.rate = serial_rate;
     }
 
-#if 0
-
     /*
      * print out conf parameters
      */
@@ -330,8 +328,6 @@ int main(int argc, char *argv[])
         amp_token_foreach(my_amp, print_conf_list, (rig_ptr_t)my_amp);
     }
 
-#endif
-
     /*
      * Print out capabilities, and exits immediately as we may be interested
      * only in caps, and rig_open may fail.
diff --git a/tests/ampctl_parse.c b/tests/ampctl_parse.c
index 757d3b5f4..73ae8023d 100644
--- a/tests/ampctl_parse.c
+++ b/tests/ampctl_parse.c
@@ -1493,7 +1493,6 @@ void usage_amp(FILE *fout)
 }
 
 
-#if 0
 int print_conf_list(const struct confparams *cfp, rig_ptr_t data)
 {
     AMP *amp = (AMP *) data;
@@ -1538,7 +1537,7 @@ int print_conf_list(const struct confparams *cfp, rig_ptr_t data)
 
     return 1;  /* != 0, we want them all ! */
 }
-#endif
+
 
 static int hash_model_list(const struct amp_caps *caps, void *data)
 {
diff --git a/tests/ampctld.c b/tests/ampctld.c
index 3874c968a..dcfe65a45 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -345,8 +345,6 @@ int main(int argc, char *argv[])
         my_amp->state.ampport.parm.serial.rate = serial_rate;
     }
 
-#if 0
-
     /*
      * print out conf parameters
      */
@@ -355,8 +353,6 @@ int main(int argc, char *argv[])
         amp_token_foreach(my_amp, print_conf_list, (rig_ptr_t)my_amp);
     }
 
-#endif
-
     /*
      * Print out conf parameters, and exits immediately as we may be
      * interested only in only caps, and rig_open may fail.