diff --git a/src/plugins/launch/aprun/launch_aprun.c b/src/plugins/launch/aprun/launch_aprun.c
index 5947a62a41dc14f02098ca79aff18f00cd4536df..926ce804b6910ae7735cefd4637fbc9e0ae99415 100644
--- a/src/plugins/launch/aprun/launch_aprun.c
+++ b/src/plugins/launch/aprun/launch_aprun.c
@@ -573,30 +573,3 @@ extern void launch_p_fwd_signal(int signal)
 	if (aprun_pid)
 		kill(aprun_pid, signal);
 }
-
-extern void launch_p_step_timeout(srun_timeout_msg_t *timeout_msg)
-{
-	time_t now = time(NULL);
-	char time_str[24];
-
-	if (now < timeout_msg->timeout) {
-		slurm_make_time_str(&timeout_msg->timeout,
-				    time_str, sizeof(time_str));
-		debug("step %u.%u. will timeout at %s",
-		      timeout_msg->job_id, timeout_msg->step_id, time_str);
-		return;
-	}
-
-	slurm_make_time_str(&now, time_str, sizeof(time_str));
-
-	error("*** STEP %u.%u CANCELLED AT %s DUE TO TIME LIMIT ***",
-	      timeout_msg->job_id, timeout_msg->step_id, time_str);
-	launch_p_fwd_signal(SIGKILL);
-	return;
-}
-
-extern void launch_p_step_complete(srun_job_complete_msg_t *comp_msg)
-{
-	launch_p_fwd_signal(SIGKILL);
-	return;
-}
diff --git a/src/plugins/launch/poe/launch_poe.c b/src/plugins/launch/poe/launch_poe.c
index 0edb2c31752fb21611d5d2f70ca4e5a1e3231438..8e895a6c5605400f788ad717abc8eb50933139b6 100644
--- a/src/plugins/launch/poe/launch_poe.c
+++ b/src/plugins/launch/poe/launch_poe.c
@@ -801,30 +801,3 @@ extern void launch_p_fwd_signal(int signal)
 	if (poe_pid)
 		kill(poe_pid, signal);
 }
-
-extern void launch_p_step_timeout(srun_timeout_msg_t *timeout_msg)
-{
-	time_t now = time(NULL);
-	char time_str[24];
-
-	if (now < timeout_msg->timeout) {
-		slurm_make_time_str(&timeout_msg->timeout,
-				    time_str, sizeof(time_str));
-		debug("step %u.%u. will timeout at %s",
-		      timeout_msg->job_id, timeout_msg->step_id, time_str);
-		return;
-	}
-
-	slurm_make_time_str(&now, time_str, sizeof(time_str));
-
-	error("*** STEP %u.%u CANCELLED AT %s DUE TO TIME LIMIT ***",
-	      timeout_msg->job_id, timeout_msg->step_id, time_str);
-	launch_p_fwd_signal(SIGKILL);
-	return;
-}
-
-extern void launch_p_step_complete(srun_job_complete_msg_t *comp_msg)
-{
-	launch_p_fwd_signal(SIGKILL);
-	return;
-}
diff --git a/src/plugins/launch/runjob/launch_runjob.c b/src/plugins/launch/runjob/launch_runjob.c
index 69c7b98896363a37290f8443491cc661ae270935..051be262246e9170b9bf7a8fbdb00856c184238a 100644
--- a/src/plugins/launch/runjob/launch_runjob.c
+++ b/src/plugins/launch/runjob/launch_runjob.c
@@ -448,15 +448,3 @@ extern void launch_p_fwd_signal(int signal)
 {
 	runjob_signal(signal);
 }
-
-extern void launch_p_step_timeout(srun_timeout_msg_t *timeout_msg)
-{
-	/* handled with the internal message thread */
-	return;
-}
-
-extern void launch_p_step_complete(srun_job_complete_msg_t *comp_msg)
-{
-	/* handled with the internal message thread */
-	return;
-}
diff --git a/src/plugins/launch/slurm/launch_slurm.c b/src/plugins/launch/slurm/launch_slurm.c
index 5471bf4b54066d7c970d673ce9b2e054b795645c..b95cc63a130ba5e5463e368079b0cad5337d910b 100644
--- a/src/plugins/launch/slurm/launch_slurm.c
+++ b/src/plugins/launch/slurm/launch_slurm.c
@@ -626,15 +626,3 @@ extern void launch_p_fwd_signal(int signal)
 		break;
 	}
 }
-
-extern void launch_p_step_timeout(srun_timeout_msg_t *timeout_msg)
-{
-	/* nothing needed */
-	return;
-}
-
-extern void launch_p_step_complete(srun_job_complete_msg_t *comp_msg)
-{
-	/* nothing needed */
-	return;
-}
diff --git a/src/srun/libsrun/launch.c b/src/srun/libsrun/launch.c
index 9ea5a87906ccf4ec65bb8e4c8d64d802a36d1721..92852b48bfa66ada4f0c5fc57854aafa176d3ea3 100644
--- a/src/srun/libsrun/launch.c
+++ b/src/srun/libsrun/launch.c
@@ -59,8 +59,6 @@ typedef struct {
 	int (*step_terminate)      (void);
 	void (*print_status)       (void);
 	void (*fwd_signal)         (int signal);
-	void (*step_timeout)       (srun_timeout_msg_t *timeout_msg);
-	void (*step_complete)      (srun_job_complete_msg_t *comp_msg);
 } plugin_ops_t;
 
 /*
@@ -75,8 +73,6 @@ static const char *syms[] = {
 	"launch_p_step_terminate",
 	"launch_p_print_status",
 	"launch_p_fwd_signal",
-	"launch_p_step_timeout",
-	"launch_p_step_complete",
 };
 
 static plugin_ops_t ops;
@@ -503,20 +499,3 @@ extern void launch_g_fwd_signal(int signal)
 
 	(*(ops.fwd_signal))(signal);
 }
-
-extern void launch_g_step_timeout(srun_timeout_msg_t *timeout_msg)
-{
-	if (launch_init() < 0)
-		return;
-
-	(*(ops.step_timeout))(timeout_msg);
-}
-
-extern void launch_g_step_complete(srun_job_complete_msg_t *comp_msg)
-{
-	if (launch_init() < 0)
-		return;
-
-	(*(ops.step_complete))(comp_msg);
-}
-
diff --git a/src/srun/libsrun/launch.h b/src/srun/libsrun/launch.h
index 83d7fca2be678dc09588e558a9fb9b85392963c3..60b1d93af431ce4ad7d024cd2ff231e2c3d17d5b 100644
--- a/src/srun/libsrun/launch.h
+++ b/src/srun/libsrun/launch.h
@@ -173,17 +173,4 @@ extern void launch_g_print_status(void);
  */
 extern void launch_g_fwd_signal(int signal);
 
-/*
- * launch_g_step_timeout() handle a timeout of a step.
- *
- */
-extern void launch_g_step_timeout(srun_timeout_msg_t *timeout_msg);
-
-/*
- * launch_g_step_complete() handle a step completion message sent from
- * slurmctld.
- *
- */
-extern void launch_g_step_complete(srun_job_complete_msg_t *comp_msg);
-
 #endif /* _LAUNCH_H */
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 5e97483a602c5feff76fc41c7dadc28774691fcd..2f069c8d6511a4241f7aee3b0f028fc0443a19a0 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -253,9 +253,7 @@ int srun(int ac, char **av)
 	_set_node_alias();
 
 	memset(&step_callbacks, 0, sizeof(step_callbacks));
-	step_callbacks.step_complete = launch_g_step_complete;
 	step_callbacks.step_signal   = launch_g_fwd_signal;
-	step_callbacks.step_timeout  = launch_g_step_timeout;
 
 	/* re_launch: */
 relaunch: