removed auto delete of components