simplify code by removing Subscription