Remove unused Variables
Remove unused imports
Add missing Else Block Braces
Fix SonarJ issues
Merge branch 'DDBNEXT-1631-BOZ' into develop