Merge branch '20230504_cleanup' into 'main'

[cleanup] clean up switches as agreed on 2023-05-04

See merge request !605