Internationalized client and removed unused imports