Remove component, fix i18n issue

- Fixed an i18n line of code using English only
- Remove component and just do partOf existence check in the template