Remove old header layout