removed commented-out lines