PIM-1526 : Do some clean up