Cleanup tag creation