{NW} Removed commented lines