Fixes for PR feedback

* headerForName -> headerValueForName
* setExtraHeaders made private, removed extraHeaders
* added removeHeaderForName