[#77590150] cleanup