Cleanup http modules

Just like the previous PR. No more to add here, ready to merge.