Handle the case when the header encoding does not include the whole header but a word only
Remove unneeded code