Removed nls tags, will change in separate issue