JBIDE-16943 - Removing unnecesary code
A few fixes suggested by Findbugs