Folders follow up

Initial follow-up, still some pending
`If there are no items to delete, ...`