final cleanup for this branch

a few commented-out lines of code deleted.