Task #197 - Remove any logic forcing one provider only