remove old commented-out code.
Implement tag removal.