Change header structure
Del unused part