Disable rollovers within internal store
Move sorting out of de-duplication algorithms