Remove Waiting On Me functionality