more tag cleanup