Change some strings for consistency.
Remove unused string.
Remove another unused string.
Merge pull request #254 from t-bullock/fix-old-strings

Fix old strings