Remove coupling between notifs and player