@tags cleanup