cleanup translation changes introduced by last merge