remove old NLS values. rename some