add deletion and workaround destroy database