Removed the content-length header, as users were experience problems when it was manually set when using a proxy service.
Also removed some pointless concatenations.