remove validation related headers when needed