Code clean up

Siyabonga Kubeka requested to merge master into main

Code clean up

Merge request reports