took out legacy references to tagging