Removing banned jdk 1.6 deps. Fixed generics to work with JDK 1.7