Further code cleanup

[AB-xdev]

Sonar is still reporting lot's of warnings, we should address these sooner or later

[AB-xdev]

Todo:

• Check all suppressed PMD warnings
• Enable PMDs CPD