Clean up ComponentService

@bug W-1960493@

@rev amcculloch@
Merging origin/goliver/master-pending-cs-cleanup into master