PIM-2266: Clean hydrator