Removed use of Java7 specific class java.util.Objects