added support for tab removal.