XX-10647 - cleanup