PIM-2852: Clean datasets