Remove unnecessary Provider