diff --git a/modules/basket/helpers/basket_installer.php b/modules/basket/helpers/basket_installer.php
index dca5da90..1ec5edb4 100644
--- a/modules/basket/helpers/basket_installer.php
+++ b/modules/basket/helpers/basket_installer.php
@@ -17,16 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
-class basket_installer
-{
-  static function install(){
-   module::set_version("basket", 1);
-  }
-  static function activate() {
-
+class basket_installer {
+  static function install() {
    $db = Database::instance();
-
    $db->query("CREATE TABLE IF NOT EXISTS {products} (
                  `id` int(9) NOT NULL auto_increment,
                  `name` TEXT NOT NULL,
@@ -34,16 +27,14 @@ class basket_installer
                  `description` varchar(1024),
                  PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-
-
-
    product::create("4x6",5,"4\"x6\" print");
    product::create("8x10",25,"8\"x10\" print");
    product::create("8x12",30,"8\"x12\" print");
 
+   module::set_version("basket", 1);
   }
 
-  static function deactivate(){
+  static function uninstall() {
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS {products}");
   }
diff --git a/modules/batchtag/helpers/batchtag_installer.php b/modules/batchtag/helpers/batchtag_installer.php
deleted file mode 100644
index 0a24b58c..00000000
--- a/modules/batchtag/helpers/batchtag_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class batchtag_installer {
-  static function install() {
-    module::set_version("batchtag", 1);
-  }
-
-  static function uninstall() {
-    module::delete("batchtag");
-  }
-}
diff --git a/modules/contactowner/helpers/contactowner_installer.php b/modules/contactowner/helpers/contactowner_installer.php
deleted file mode 100644
index 4292ea34..00000000
--- a/modules/contactowner/helpers/contactowner_installer.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class contactowner_installer {
-  static function install() {
-    module::set_version("contactowner", 1);
-  }
-}
diff --git a/modules/developer/helpers/developer_installer.php b/modules/developer/helpers/developer_installer.php
deleted file mode 100644
index acf0526c..00000000
--- a/modules/developer/helpers/developer_installer.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class developer_installer {
-  static function install() {
-    module::set_version("developer", 1);
-  }
-
-  static function upgrade($version) {
-  }
-
-  static function uninstall() {
-    module::delete("developer");
-  }
-}
diff --git a/modules/displaytags/helpers/displaytags_installer.php b/modules/displaytags/helpers/displaytags_installer.php
deleted file mode 100644
index 42f58c57..00000000
--- a/modules/displaytags/helpers/displaytags_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class displaytags_installer {
-  static function install() {
-    module::set_version("displaytags", 1);
-  }
-
-  static function uninstall() {
-    module::delete("displaytags");
-  }
-}
diff --git a/modules/downloadfullsize/helpers/downloadfullsize_installer.php b/modules/downloadfullsize/helpers/downloadfullsize_installer.php
deleted file mode 100644
index a72811c1..00000000
--- a/modules/downloadfullsize/helpers/downloadfullsize_installer.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class downloadfullsize_installer {
-  static function install() {
-    module::set_version("downloadfullsize", 1);
-  }
-}
diff --git a/modules/dynamic/helpers/dynamic_installer.php b/modules/dynamic/helpers/dynamic_installer.php
index 023c0da9..fd67a8ed 100644
--- a/modules/dynamic/helpers/dynamic_installer.php
+++ b/modules/dynamic/helpers/dynamic_installer.php
@@ -37,8 +37,4 @@ class dynamic_installer {
       module::set_version("dynamic", 1);
     }
   }
-
-  static function uninstall() {
-    module::delete("dynamic");
-  }
 }
diff --git a/modules/editcreation/helpers/editcreation_installer.php b/modules/editcreation/helpers/editcreation_installer.php
deleted file mode 100644
index 7093edcd..00000000
--- a/modules/editcreation/helpers/editcreation_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class editcreation_installer {
-  static function install() {
-    module::set_version("editcreation", 1);
-  }
-
-  static function uninstall() {
-    module::delete("editcreation");
-  }
-}
diff --git a/modules/embedlinks/helpers/embedlinks_installer.php b/modules/embedlinks/helpers/embedlinks_installer.php
deleted file mode 100644
index 2c835ccd..00000000
--- a/modules/embedlinks/helpers/embedlinks_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class embedlinks_installer {
-  static function install() {
-    module::set_version("embedlinks", 1);
-  }
-}
diff --git a/modules/gmaps/helpers/gmaps_installer.php b/modules/gmaps/helpers/gmaps_installer.php
deleted file mode 100644
index a21f902d..00000000
--- a/modules/gmaps/helpers/gmaps_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class gmaps_installer {
-  static function install() {
-    module::set_version("gmaps", 1);
-  }
-}
diff --git a/modules/itemchecksum/helpers/itemchecksum_installer.php b/modules/itemchecksum/helpers/itemchecksum_installer.php
deleted file mode 100644
index 94e78bf1..00000000
--- a/modules/itemchecksum/helpers/itemchecksum_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class itemchecksum_installer {
-  static function install() {
-    module::set_version("itemchecksum", 1);
-  }
-
-  static function uninstall() {
-    module::delete("itemchecksum");
-  }
-}
diff --git a/modules/keeporiginal/helpers/keeporiginal_installer.php b/modules/keeporiginal/helpers/keeporiginal_installer.php
index e4a0c8b3..cc034586 100644
--- a/modules/keeporiginal/helpers/keeporiginal_installer.php
+++ b/modules/keeporiginal/helpers/keeporiginal_installer.php
@@ -22,8 +22,4 @@ class keeporiginal_installer {
     @mkdir(VARPATH . "original");
     module::set_version("keeporiginal", 1);
   }
-
-  static function uninstall() {
-    module::delete("keeporiginal");
-  }
 }
diff --git a/modules/latestupdates/helpers/latestupdates_installer.php b/modules/latestupdates/helpers/latestupdates_installer.php
deleted file mode 100644
index 71284ec7..00000000
--- a/modules/latestupdates/helpers/latestupdates_installer.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class latestupdates_installer {
-  static function install() {
-    $version = module::get_version("latestupdates");
-    if ($version == 0) {
-      module::set_version("latestupdates", 1);
-    }
-  }
-
-  static function uninstall() {
-    module::delete("latestupdates");
-  }
-}
diff --git a/modules/metadescription/helpers/metadescription_installer.php b/modules/metadescription/helpers/metadescription_installer.php
deleted file mode 100644
index 030c08d0..00000000
--- a/modules/metadescription/helpers/metadescription_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class metadescription_installer {
-  static function install() {
-    module::set_version("metadescription", 1);
-  }
-}
diff --git a/modules/minislideshow/helpers/minislideshow_installer.php b/modules/minislideshow/helpers/minislideshow_installer.php
index 1255ad3d..378b3c68 100644
--- a/modules/minislideshow/helpers/minislideshow_installer.php
+++ b/modules/minislideshow/helpers/minislideshow_installer.php
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class minislideshow_installer {
-  static function install() {
-    module::set_version("minislideshow", 1);
-  }
-
   static function deactivate() {
     site_status::clear("minislideshow_needs_rss");
   }
-
-  static function uninstall() {
-    module::delete("minislideshow");
-  }
 }
diff --git a/modules/nobots/helpers/nobots_installer.php b/modules/nobots/helpers/nobots_installer.php
deleted file mode 100644
index b17c691d..00000000
--- a/modules/nobots/helpers/nobots_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class nobots_installer {
-  static function install() {
-    module::set_version("nobots", 1);
-  }
-}
diff --git a/modules/phpmailer/helpers/phpmailer_installer.php b/modules/phpmailer/helpers/phpmailer_installer.php
deleted file mode 100644
index 2c264f68..00000000
--- a/modules/phpmailer/helpers/phpmailer_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class phpmailer_installer {
-  static function install() {
-    module::set_version("phpmailer", 1);
-  }
-
-  static function uninstall() {
-    module::delete("phpmailer");
-  }
-}
diff --git a/modules/polar_rose/helpers/polar_rose_installer.php b/modules/polar_rose/helpers/polar_rose_installer.php
deleted file mode 100644
index aaee2d7e..00000000
--- a/modules/polar_rose/helpers/polar_rose_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class polar_rose_installer {
-  static function install() {
-    module::set_version("polar_rose", 1);
-  }
-}
diff --git a/modules/purifier/helpers/purifier_installer.php b/modules/purifier/helpers/purifier_installer.php
deleted file mode 100644
index f9bbe007..00000000
--- a/modules/purifier/helpers/purifier_installer.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class purifier_installer {
-  static function install() {
-    module::set_version("purifier", 1);
-  }
-}
diff --git a/modules/rescue/helpers/rescue_installer.php b/modules/rescue/helpers/rescue_installer.php
deleted file mode 100644
index ecd2325e..00000000
--- a/modules/rescue/helpers/rescue_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class rescue_installer {
-  static function install() {
-    module::set_version("rescue", 1);
-  }
-}
diff --git a/modules/tagsmap/helpers/tagsmap_installer.php b/modules/tagsmap/helpers/tagsmap_installer.php
index 5fd7b754..0f4be53b 100644
--- a/modules/tagsmap/helpers/tagsmap_installer.php
+++ b/modules/tagsmap/helpers/tagsmap_installer.php
@@ -43,6 +43,5 @@ class tagsmap_installer {
     // Delete the GPS table before uninstalling.
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS {tags_gpses};");
-    module::delete("tagsmap");
   }
 }
diff --git a/modules/user_homes/helpers/user_homes_installer.php b/modules/user_homes/helpers/user_homes_installer.php
index 0e80e6c1..1a2af803 100644
--- a/modules/user_homes/helpers/user_homes_installer.php
+++ b/modules/user_homes/helpers/user_homes_installer.php
@@ -20,13 +20,6 @@
 
 class user_homes_installer {
   static function install() {
-    module::set_version("user_homes", 1);
-  }
-
-  /**
-   * Installs the table of user homes when the module is installed.
-   */
-  static function activate() {
     $db = Database::instance();
     $db->query("CREATE TABLE IF NOT EXISTS {user_homes} (
                   `id` int(9) NOT NULL,
@@ -40,7 +33,7 @@ class user_homes_installer {
   /**
    * Drops the table of user homes when the module is uninstalled.
    */
-  static function deactivate() {
+  static function uninstall() {
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS {user_homes};");
   }
diff --git a/modules/videodimensions/helpers/videodimensions_installer.php b/modules/videodimensions/helpers/videodimensions_installer.php
deleted file mode 100644
index 098fca08..00000000
--- a/modules/videodimensions/helpers/videodimensions_installer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class videodimensions_installer {
-  static function install() {
-    module::set_version("videodimensions", 1);
-  }
-
-  static function uninstall() {
-    module::delete("videodimensions");
-  }
-}