Merge "cleanup comments"