Refix the removeComponent