More cleanups.

- Understand if the issue is missing recycled files.
- A few cleanups.