Minor refactoring and deleted client id for schema [GONRG-4802]

Merge request reports

Loading