Dependencies cleanup, and compatibility fix for Eclipse