eliminate more observables and computeds