minor cleanup by removing some commented-out old code