Remove unused code & Fix translations