diff --git a/modules/ds_extras/ds_extras.vd.inc b/modules/ds_extras/ds_extras.vd.inc
index 0f41c87..097d7b2 100644
--- a/modules/ds_extras/ds_extras.vd.inc
+++ b/modules/ds_extras/ds_extras.vd.inc
@@ -184,12 +184,12 @@ function ds_extras_vd_bundle_remove_submit($form, &$form_state) {
     ->execute();
 
   // Remove layout.
-  db_delete('ds_layouts')
+  db_delete('ds_layout_settings')
     ->condition('bundle', $bundle)
     ->execute();
 
   // Remove settings.
-  db_delete('ds_settings')
+  db_delete('ds_field_settings')
     ->condition('bundle', $bundle)
     ->execute();