removed dead commented-out code