also cleanup the custom datastructure for pr1195 resolutions