Improve equals() and hashCode() behaviour

also remove some needless logging