Even more string-resources cleanup