Removal of some auto-generated comments