CONTENTBOX-381: Provider cleanup and polish
CONTENTBOX-381: Provider cleanup and polish