semi-final tagmanager cleaning

The next cleaning will be actually moving to the core!