Refactor removed un-needed token provider.