PIM-1323 : Clean use statements