Code housekeeping #903
Description
This is a developer ticket. Changes in the code that do housekeeping should use that ticket. Add a short line to that ticket to keep track of what was done.
Commits on that ticket do not need to be part of the changelog.