remove not needed message and adapt header path