Removed unnescessary commented-out code