Change the WebSocket API to use HttpHeaders instead of Map<String, String> for custom headers / Cleanup