Provider Celanup

Started cleaning up at the PS Drive level of objects.