ReactiveWebService clean up