finish moving to rxjs