Avoid Removal Orders

Avoid Removal Orders