Remove unused code
store and expose headers