fixed wrong position of removing
refactoring. replace import with component-scan
added the internationalisation