Clean up unnecessary tags