Cleaning up the scripts.

Much more needs to be done, but unnecessary comments and
some unneeded lines now gone.