Final tag cleanup