PIM-2833: Clean use statements