Problem formulation cleanup.
Cleanup
Cleanup