NEXUS-6569: Few more places

removing the spread use of this header, now that
it's set at one place and applied to all