Cleanup states were added to keep track of this removal as a failure to
remove will require manual intervention from an admin.