am e71b1644: am b654c68a: [provider] Clean up unused code used to use for....

* commit 'e71b1644aa029820585ae00cc38c0b0d32906e1d':
  [provider] Clean up unused code used to use for....