TRIVIAL removing some commented-out code that may never work