This PR removes the NativeTokenFetcherSingleton as per the discussion here
NativeTokenFetcherSingleton