Fix Sonar warnings
Fix
Cleanup pom