Getting rid of JDK 1.7 unneeded dependencies so it is easier to port back code to other projects.