TagService cleanup