Cleaned up references to starter-components