Revert "FORUM-991 | Fix critical violations in Sonar"

This reverts commit ff17ee02fcbb420bd5b7e6e479e104c35b0d50b9.
Revert "FORUM-991 | Fix critical violations in Sonar"

This reverts commit dc95a11cf2134954c7e11d22dc49a398ae613bea.