[#76419240] cleanup