PIM-1323 : Make some clean up