Add remove-orphan to allow attribute deletion