removing some no-long-valid commenting and debug