Seed data and schema cleanup for merge