Cleanup of unused imports in 1431e3b