PIM-1246 : Reorder use statements