remove many comments, and make it same as the p4 change