added removeHeader support