Tidy up configuration of components.