Remove commented-out old code, now reimplemented.