took out commented-out code