Untrack db.json and a few related tweaks