Cleaned some more Tag reference.