Remove wrong subcomponents