some cleanup of the database initialization code.