Remove more components, rearrange components.