Clean up manage_header tag code