(#558) - ensure that remove leaves only stub