Removing more Java 7 stuff and using Guava instead