More TagManager cleaning

Closer and closer to being able to move coreward