[#66172530] cleanup for PR