cleaning up db on destruction.
Merge branch 'vault' into next