Revert "SOC-4410 | Fix critical violations in Sonar."

This reverts commit 8e3a967bd44621a432262784094f005c12372efc.