Remove unused imports
Refactor language specific code