removed commented-out code from old version