Merge "Cleanup comments" into main