Tag Plugin: clean-up