Cleanup http API a bit..