PIM-2977: Clean comments