Removed unneeded commented-out code