Cleanup
Refactor the disposable returned by BaseObservable