Reduce header size sooner