Deleted unused depedencies.
Changes for Java 1.6 compatibility (concerning type inference).