Fixed header_remove()