Removing lots of old code, small tweak to Tag