20230215 cleanup See merge request !438
mentioned in issue #345 (closed)
mentioned in commit 66508837