Tweaking header a bit, removing redudant information