Cl

Clean-up tag handler