Remove references to tags