Removed some redundant comments/commented-out code