Cleaning up Apache HC driver

Minor changes - should be straightforward.
@demobox This line should be removed as well since http is registered inline on line 135.