removed unneeded commented-out code