Cleanup unused imports and add a missing import
Prepare for release