Removing extraneous headers creation