Attempt to clean up the database cluster directory

[henrymercer]

This will help to avoid issues where the database cluster directory is left in an inconsistent state.

Merge / deployment checklist

• [ ] Confirm this change is backwards compatible with existing workflows.
• [ ] Confirm the readme has been updated if necessary.
• [ ] Confirm the changelog has been updated if necessary.