remove unnecessary HTTP Builder dependency, refactoring