Cleanup: Get rid of an unused import
Cleanup: Update an outdated docstring