Updated and components/version removed