Remove unused dependency
Remove translator dependency
Refactoring
Minor refactoring