Add comments and remove old default comments

[ci skip]