Remove component references