Clean up of simplex and simplex2. Simplex works; simplex2 does not converge as well.