diff --git a/stormexpense/stormexpense.install b/stormexpense/stormexpense.install
index bd0c88c..46a82ae 100644
--- a/stormexpense/stormexpense.install
+++ b/stormexpense/stormexpense.install
@@ -45,7 +45,8 @@ function stormexpense_disable() {
 function stormexpense_uninstall() {
   drupal_uninstall_schema('stormexpense');
 
-  db_query($s = "DELETE FROM {stormattribute} WHERE domain IN ('Expense status', 'Expense status search')");
+  db_delete('stormattribute')
+    ->condition('domain', array('Expense status', 'Expense status search'), 'IN');
 }
 
 function stormexpense_schema() {
diff --git a/stormorganization/stormorganization.install b/stormorganization/stormorganization.install
index 568d7d7..1264cf2 100644
--- a/stormorganization/stormorganization.install
+++ b/stormorganization/stormorganization.install
@@ -289,7 +289,8 @@ function stormorganization_disable() {
 function stormorganization_uninstall() {
   drupal_uninstall_schema('stormorganization');
 
-  db_query($s = "DELETE FROM {stormattribute} WHERE domain IN ('Price mode', 'Currency', 'Country')");
+  db_delete('stormattribute')
+    ->condition('domain', array('Price mode', 'Currency', 'Country'), 'IN');
 }
 
 function stormorganization_schema() {
diff --git a/stormproject/stormproject.install b/stormproject/stormproject.install
index e4161b0..99ca575 100644
--- a/stormproject/stormproject.install
+++ b/stormproject/stormproject.install
@@ -81,7 +81,8 @@ function stormproject_disable() {
 function stormproject_uninstall() {
   drupal_uninstall_schema('stormproject');
 
-  db_query($s = "DELETE FROM {stormattribute} WHERE domain IN ('Project status', 'Project status search', 'Project category', 'Project category search', 'Project priority', 'Project priority search', 'Duration unit')");
+  db_delete('stormattribute')
+    ->condition('domain', array('Project status', 'Project status search', 'Project category', 'Project category search', 'Project priority', 'Project priority search', 'Duration unit'), 'IN');
 }
 
 function stormproject_schema() {
diff --git a/stormtask/stormtask.install b/stormtask/stormtask.install
index 11db15e..61ef348 100644
--- a/stormtask/stormtask.install
+++ b/stormtask/stormtask.install
@@ -73,7 +73,11 @@ function stormtask_install() {
     $prevdomain = $domain;
   }
 
-  db_query("UPDATE {stormattribute} SET isdefault = 1 WHERE domain = 'Task category' and akey = 'task'");
+  db_update('stormattribute')
+    ->fields(array('isdefault', 1))
+    ->condition('domain', 'task category')
+    ->condition('akey', 'task')
+    ->execute();
 }
 
 function stormtask_disable() {
@@ -83,7 +87,8 @@ function stormtask_disable() {
 function stormtask_uninstall() {
   drupal_uninstall_schema('stormtask');
 
-  db_query($s = "DELETE FROM {stormattribute} WHERE domain IN ('Task status', 'Task status search', 'Task category', 'Task category search', 'Task priority', 'Task priority search')");
+  db_delete('stormattribute')
+    ->condition('domain', array('Task status', 'Task status search', 'Task category', 'Task category search', 'Task priority', 'Task priority search'), 'IN');
 }
 
 function stormtask_schema() {
diff --git a/stormticket/stormticket.install b/stormticket/stormticket.install
index e6b23af..507199d 100644
--- a/stormticket/stormticket.install
+++ b/stormticket/stormticket.install
@@ -84,7 +84,8 @@ function stormticket_disable() {
 function stormticket_uninstall() {
   drupal_uninstall_schema('stormticket');
 
-  db_query($s = "DELETE FROM {stormattribute} WHERE domain IN ('Ticket status', 'Ticket status search', 'Ticket priority', 'Ticket priority search', 'Ticket category', 'Ticket category search')");
+  db_delete('stormattribute')
+    ->condition('domain', array('Ticket status', 'Ticket status search', 'Ticket category', 'Ticket category search', 'Ticket priority', 'Ticket priority search'), 'IN');
 }
 
 function stormticket_schema() {