EXT-147 removed the commented lines