Remove use of BearerStrategy