Refactor out build service usage to use webapi