Leaving strings to a separate commit to make it clearer when they were removed, in case they need to be reinstated.