remove commented-out old test code