Simplified the database setup, let the Toolkit do the version management