Removal bug fix(es).

Fixes a known bug.