Remove debugging output and some unneeded constraints.