refactor build object method
clean up client inclusion for gateways