Simplify db migration

As per feedback from @fraenkel