NEXUS-5960: Killing remnants found by Alin