Remove some duplicate strings

More and more clean up.