Revert "Tidy up strings and delete unused code"

This reverts commit fece1aebabbe00cca6cdf1bcfb93f5b44b36ce2a.