Remove unused variables
- Fix imports
- Remove unused private methods
Remove senseless ? operator
Merge remote-tracking branch 'origin/APD-Sonar-Cleanup' into develop