diff --git a/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc b/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
index 7d295c1ad5d80c299407e0c9086d946a326da815..03e52f357c51f604b06988770bdb1e3ef6aa1dca 100644
--- a/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
+++ b/src/plugins/select/bluegene/bl_bgq/bridge_linker.cc
@@ -325,21 +325,8 @@ static void _remove_jobs_on_block_and_reset(char *block_id,
 	 * issues where a step could complete after the job completion
 	 * has taken place (since we are on a thread here).
 	 */
-	if (job_ptr) {
+	if (job_ptr)
 		lock_slurmctld(job_read_lock);
-		if (job_ptr->magic == JOB_MAGIC) {
-			select_jobinfo_t *jobinfo = (select_jobinfo_t *)
-				job_ptr->select_jobinfo->data;
-			/* This means the job is finished and ready to be
-			   taken away.
-			*/
-			jobinfo->block_cnode_cnt = 0;
-		} else {
-			error("We have a job with a bad magic. "
-			      "This should never happen.  It was running on %s",
-			      block_id);
-		}
-	}
 	slurm_mutex_lock(&block_state_mutex);
 	bg_record = find_bg_record_in_list(bg_lists->main, block_id);
 	if (bg_record) {
diff --git a/src/plugins/select/bluegene/select_bluegene.c b/src/plugins/select/bluegene/select_bluegene.c
index 1ec81ef64bbc26d0c38c8df26e9eff6d6e2ffe5f..80d95f534f98961879809e3c367db0921a1c7454 100644
--- a/src/plugins/select/bluegene/select_bluegene.c
+++ b/src/plugins/select/bluegene/select_bluegene.c
@@ -2102,27 +2102,6 @@ extern int select_p_step_finish(struct step_record *step_ptr)
 	return rc;
 }
 
-/* The job lock should be in place before calling this function. */
-extern int select_p_is_job_finished(struct job_record *job_ptr)
-{
-#ifdef HAVE_BGQ
-	if (job_ptr && job_ptr->magic == JOB_MAGIC) {
-		select_jobinfo_t *jobinfo = (select_jobinfo_t *)
-			job_ptr->select_jobinfo->data;
-		/* This means the job is finished and ready to be
-		   taken away.
-		*/
-		if (!jobinfo->block_cnode_cnt)
-			return 1;
-		else
-			return 0;
-	}
-
-	error("Checking a job with bad magic, this should never happen.");
-#endif
-	return 1;
-}
-
 /* The unpack for this is in common/slurm_protocol_pack.c */
 extern int select_p_pack_select_info(time_t last_query_time,
 				     uint16_t show_flags, Buf *buffer_ptr,