PIM-1489 : Clean children response