JBIDE-16856 - UI Freeze at startup (wakes up later)
JBIDE-16943 - Removing unnecesary code
A few fixes suggested by Findbugs