Simplified message header changed/removed logic