Fix orphan removal