remove and add comment