commented out things that needed SafeObservableSubscription