remove commented-out, unused code