Some tidy-up. Partially split from MR !1613 (merged).
- Delete unused function in
Please suggest any people who would be appropriate to review your code.
Please add any other information that could be useful for reviewers.
Functions and classes, or changes to them, are documented. [ ] User guide/documentation is updated.
Changelog is updated. [ ] Suitable tests added for new functionality.
Contributed code is correctly formatted. (See the contributing guidelines). [ ] License added to any new files.
No extraneous files have been added (e.g. compiler output or test data files).