Various fixes for NLS, including removing unused strings.