comment cruft and unneeded functions removed -> clean up.