More code clean-up

1 job for !37 with Azure-VDS-Pipeline-Fixes in 8 minutes and 17 seconds (queued for 2 seconds)
latest merge request