remove extra comments and notes