Revert "Fixing sonar issues"

This reverts commit dc8ebfb859ea5e4c9169c2a2fdcd5782044bab9e.

Revert