Change translation and remove dependency