Remove duplicated tag creation