diff --git a/src/plugins/select/bluegene/bgl_job_run.c b/src/plugins/select/bluegene/bgl_job_run.c
index b3f450fb3d9c2956ff97b05f5dc0ce01c8636cb2..fd1c70d346cf4725e176bb62bf181146da710d52 100644
--- a/src/plugins/select/bluegene/bgl_job_run.c
+++ b/src/plugins/select/bluegene/bgl_job_run.c
@@ -308,8 +308,7 @@ static void _start_agent(bgl_update_t *bgl_update_ptr)
 
 	slurm_mutex_lock(&part_state_mutex);
 	bgl_record->boot_count = 0;
-	if(bgl_record->target_name) 
-		xfree(bgl_record->target_name);
+	xfree(bgl_record->target_name);
 	bgl_record->target_name = xstrdup(uid_to_string(bgl_update_ptr->uid));
 	debug("setting the target_name for Partition %s to %s",
 	      bgl_record->bgl_part_id,
diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index d80a2f047f3dd81da75d072ddb74e8fb11d07a66..6cdcdbdc7132177415a0c9d3a191d82abcf5eeb7 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -176,20 +176,16 @@ extern void destroy_bgl_record(void* object)
 	bgl_record_t* bgl_record = (bgl_record_t*) object;
 
 	if (bgl_record) {
-		if(bgl_record->nodes) 
-			xfree(bgl_record->nodes);
-		if(bgl_record->user_name)
-			xfree(bgl_record->user_name);
-		if(bgl_record->target_name)
-			xfree(bgl_record->target_name);
+		xfree(bgl_record->nodes);
+		xfree(bgl_record->user_name);
+		xfree(bgl_record->target_name);
 		if(bgl_record->bgl_part_list)
 			list_destroy(bgl_record->bgl_part_list);
 		if(bgl_record->hostlist)
 			hostlist_destroy(bgl_record->hostlist);
 		if(bgl_record->bitmap)
 			bit_free(bgl_record->bitmap);
-		if(bgl_record->bgl_part_id)
-			xfree(bgl_record->bgl_part_id);
+		xfree(bgl_record->bgl_part_id);
 		
 		xfree(bgl_record);
 	}
@@ -1485,8 +1481,7 @@ static int _parse_bgl_spec(char *in_line)
 	else
 		bgl_record->conn_type = SELECT_MESH;
 	
-	if (conn_type)
-		xfree(conn_type);
+	xfree(conn_type);
 
 	bgl_record->node_use = SELECT_COPROCESSOR_MODE;