added tag cleanup