Removed java 8 dependencies.

Now compliant with java 7.