Removed references to components.