[FIXUP] Remove last traces of tags.