Removed unused code
Changed calls to static methods to get rid of eclipse warnings
Fixes #1586
Fixes #1586 - added ee jar file
#1586