removed several lines