More clean up of component related infrastructure. (part 2)