Switch to using CompositeSubscription