Some commented lines deleted