Added removal of headers