Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/control_core.cpp	(revision 11301)
+++ /issm/trunk-jpl/src/c/solutions/control_core.cpp	(revision 11302)
@@ -106,10 +106,4 @@
 		
 		if(controlconvergence(J[n],tol_cm)) break;
-
-		/*Temporary saving every 5 control steps: */
-		/*if (((n+1)%5)==0){
-			_printf_(VerboseControl(),"%s\n","   saving temporary results");
-			controlrestart(femmodel,J);
-		}*/
 	}
 
Index: /issm/trunk-jpl/src/c/solutions/gradient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/gradient_core.cpp	(revision 11301)
+++ /issm/trunk-jpl/src/c/solutions/gradient_core.cpp	(revision 11302)
@@ -40,6 +40,4 @@
 		Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]);
 
-		if(control_steady)diagnostic_core(femmodel);
-
 		if (step>0 && search_scalar==0){
 			_printf_(VerboseControl(),"   orthogonalization\n");
@@ -48,6 +46,5 @@
 		}
 		else{ 
-			_printf_(VerboseControl(),"   normalizing directions\n");
-			Orthx(&new_gradient,gradient,NULL); VecFree(&gradient);
+			new_gradient=gradient;
 		}
 
@@ -66,4 +63,7 @@
 	for (int i=0;i<num_controls;i++) ControlInputScaleGradientx(femmodel-> elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials,  femmodel->parameters,control_type[i],optscal);
 
+	/*For Nightly run compatibility, do a last diagnostic FIXME: to be removed*/
+	if(control_steady)diagnostic_core(femmodel);
+
 	/*Clean up and return*/
 	xfree((void**)&control_type);
Index: /issm/trunk-jpl/src/m/solutions/control_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/control_core.m	(revision 11301)
+++ /issm/trunk-jpl/src/m/solutions/control_core.m	(revision 11302)
@@ -83,5 +83,4 @@
 	end
 	femmodel.results=AddExternalResult(femmodel.results,JEnum,J);
-	%femmodel.results=AddExternalResult(femmodel.results,InversionControlParametersEnum,control_type);
 
 end %end function
Index: /issm/trunk-jpl/src/m/solutions/gradient_core.m
===================================================================
--- /issm/trunk-jpl/src/m/solutions/gradient_core.m	(revision 11301)
+++ /issm/trunk-jpl/src/m/solutions/gradient_core.m	(revision 11302)
@@ -31,8 +31,4 @@
 		grad=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i));
 
-		if control_steady,
-			femmodel=diagnostic_core(femmodel);
-		end
-
 		if (step>1 && search_scalar==0),
 			issmprintf(VerboseControl,'%s',['   orthogonalization']);
@@ -40,6 +36,5 @@
 			new_gradient=Orth(grad,old_gradient);
 		else
-			issmprintf(VerboseControl,'%s',['   normalizing direction']);
-			new_gradient=Orth(grad,[]);
+			new_gradient=grad;
 		end
 
@@ -58,2 +53,7 @@
 		[femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,  femmodel.parameters,control_type(i),gradient_scaling);
 	end
+
+	if control_steady,
+		femmodel=diagnostic_core(femmodel);
+	end
+