Fix improperly overriden equals() and hashcode()
Remove unused factory