Remove translation. Code refactoring