Clean up db

Fixes #38