Removing observable.time and splitting out operators