Clean up old delegate provider stuff.

@bug W-2357703@

@rev eric.anderson@
Merging origin/goliver/master-pending-no-delegate into master