Cleaning up Apache HC driver

Minor changes - should be straightforward.
Same as above. This line should be removed as well since https is registered inline on line 136.