Clean infos

As discussed, let's include the hints in the hash.