Simplify remove cell option.
Simplify remove_only_avail.