removed some unused code
fixed eclipse integration