fix comments, extract deletion to separate method