Removing unused code from Desktop and fix some more PMD warnings
Merge remote-tracking branch 'upstream/1.9-maint'
Fix some PMD warnings