Remove TagDataService, fix tests