Replace ad-hoc observables (sinks) with RX ones