remove commented-out cruft
fix #695