Removed the banned dependencies and fixed the generics to work with JDK 1.7.