removed unnecessary observables