Merge "Clean up comment" into main