Remove more comments