M-2696: Clean use statements