Cleanup #21962 -- Cleaned up unused imports added in previous commit