Fix all removals