remove old http_server and reindent code
merge