Removing more unnecessary equals and hashCode