Remove service-bus-module dependency