ENG-6428: comments and dont delete last segment.