Revert "Revert "Tidy up strings and delete unused code""

This reverts commit 997fd39642eede778ec6ea9050346a7dc6e47e16.