removed storing of Provider references