diff --git a/src/plugins/select/bluegene/bgl_job_run.c b/src/plugins/select/bluegene/bgl_job_run.c
index 8cc8c07d851988589561be67b2cae6311679ad38..3577b954c295b75882cb4bd65176ba1e67bf54b2 100644
--- a/src/plugins/select/bluegene/bgl_job_run.c
+++ b/src/plugins/select/bluegene/bgl_job_run.c
@@ -229,13 +229,6 @@ static void _start_agent(bgl_update_t *bgl_update_ptr)
 		return;
 	}
 	
-	/* if(bgl_record->node_use != bgl_update_ptr->node_use) { */
-/* 		debug("Partition in wrong mode, rebooting."); */
-		
-/* 		/\* Free the partition *\/ */
-/* 		bgl_free_partition(bgl_record);			 */
-/* 	} */
-
 	if(bgl_record->state == RM_PARTITION_DEALLOCATING) {
 		debug("Partition is in Deallocating state, waiting for free.");
 		bgl_free_partition(bgl_record);
@@ -799,7 +792,7 @@ extern int sync_jobs(List job_list)
  * NOTE: This function does not wait for the boot to complete.
  * the slurm prolog script needs to perform the waiting.
  */
-extern int boot_part(bgl_record_t *bgl_record, rm_partition_mode_t node_use)
+extern int boot_part(bgl_record_t *bgl_record)
 {
 #ifdef HAVE_BGL_FILES
 	int rc;
@@ -812,25 +805,16 @@ extern int boot_part(bgl_record_t *bgl_record, rm_partition_mode_t node_use)
 		      bgl_err_str(rc));
 		return SLURM_ERROR;
 	}
-	if(node_use == SELECT_VIRTUAL_NODE_MODE) {
-		info("Booting partition %s in virtual mode", 
-		     bgl_record->bgl_part_id);
-		if ((rc = pm_create_partition_vnm(bgl_record->bgl_part_id)) 
-		    != STATUS_OK) {
-			error("pm_create_partition(%s): %s",
-			      bgl_record->bgl_part_id, bgl_err_str(rc));
-			return SLURM_ERROR;
-		}	
-	} else  {
-		info("Booting partition %s in coprocessor mode", 
-		     bgl_record->bgl_part_id);
-		if ((rc = pm_create_partition(bgl_record->bgl_part_id)) 
-		    != STATUS_OK) {
-			error("pm_create_partition(%s): %s",
-			      bgl_record->bgl_part_id, bgl_err_str(rc));
-			return SLURM_ERROR;
-		}	
-	}
+	
+	info("Booting partition %s", 
+	     bgl_record->bgl_part_id);
+	if ((rc = pm_create_partition(bgl_record->bgl_part_id)) 
+	    != STATUS_OK) {
+		error("pm_create_partition(%s): %s",
+		      bgl_record->bgl_part_id, bgl_err_str(rc));
+		return SLURM_ERROR;
+	}	
+	
 	slurm_mutex_lock(&part_state_mutex);
 	/* reset state right now, don't wait for 
 	 * update_partition_list() to run or epilog could 
diff --git a/src/plugins/select/bluegene/bgl_job_run.h b/src/plugins/select/bluegene/bgl_job_run.h
index 21130d4f128e5f471a804b6ec927c3c4d35999ab..b94c76ec77ea6e465c5820a3e4cd77a096d35a3b 100644
--- a/src/plugins/select/bluegene/bgl_job_run.h
+++ b/src/plugins/select/bluegene/bgl_job_run.h
@@ -73,5 +73,5 @@ extern int sync_jobs(List job_list);
  * NOTE: This function does not wait for the boot to complete.
  * the slurm prolog script needs to perform the waiting.
  */
-extern int boot_part(bgl_record_t *bgl_record, rm_partition_mode_t node_use);
+extern int boot_part(bgl_record_t *bgl_record);
 #endif /* _BGL_JOB_RUN_H_ */
diff --git a/src/plugins/select/bluegene/bgl_part_info.c b/src/plugins/select/bluegene/bgl_part_info.c
index 6752652bd14302e367dd2f18acd1a2e499af1533..8e18b24b1e05b6a2d9561708405763638b798e07 100644
--- a/src/plugins/select/bluegene/bgl_part_info.c
+++ b/src/plugins/select/bluegene/bgl_part_info.c
@@ -78,9 +78,7 @@ static int _partition_is_deallocating(bgl_record_t *bgl_record)
 				      "Job was lost.",
 				      bgl_record->bgl_part_id,
 				      bgl_record->user_name);
-				xfree(bgl_record->target_name);
-				bgl_record->target_name = 
-					xstrdup(bgl_record->user_name);
+				update_partition_user(bgl_record);
 				//term_jobs_on_part(bgl_record->bgl_part_id);
 			} else {
 				debug("Partition %s was in a ready state "
diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index 3274ab18386e23b2283d052b3cae8c3cd9e3e796..0326211223f58e60b43cca4f6bfb439cb8ed5768 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -606,8 +606,7 @@ extern int create_static_partitions(List part_list)
 		       != NULL) {
 			
 			if(bgl_record->bp_count>0 
-			   && !bgl_record->full_partition
-			   && bgl_record->node_use==SELECT_COPROCESSOR_MODE) {
+			   && !bgl_record->full_partition) {
 				debug("adding %s %d%d%d",
 				      bgl_record->nodes,
 				      bgl_record->start[X],