Remove unneeded header
Simplify pack format