Comment and set removal