I think probably the right approach is to just nuke the database and start fresh each time. The only reason we're not doing this already is because the creation hapens on import, see issue #10