Cleanup 20230113

multrusrequested to merge
cleanup_20230113 into main

Acceptance of switches decided on call 2023-01-12

Merge request reports