Remove unused field
Use Guava Objects instead of Java 7 Objects