cleaned out some remaining cruft.