Add progress reporting
Clean up unused imports