Removing last Khresmoi remnants