diff --git a/modules/noffmpeg/helpers/movie.php b/modules/noffmpeg/helpers/movie.php
deleted file mode 100644
index 801796b8..00000000
--- a/modules/noffmpeg/helpers/movie.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 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.
- */
-
-/**
- * This is the API for handling movies.
- *
- * Note: by design, this class does not do any permission checking.
- */
-class movie_Core {
-  static function get_edit_form($movie) {
-    $form = new Forge("movies/update/$movie->id", "", "post", array("id" => "g-edit-movie-form"));
-    $form->hidden("from_id")->value($movie->id);
-    $group = $form->group("edit_item")->label(t("Edit Movie"));
-    $group->input("title")->label(t("Title"))->value($movie->title)
-      ->error_messages("required", t("You must provide a title"))
-      ->error_messages("length", t("Your title is too long"));
-    $group->textarea("description")->label(t("Description"))->value($movie->description);
-    $group->input("name")->label(t("Filename"))->value($movie->name)
-      ->error_messages(
-        "conflict", t("There is already a movie, photo or album with this name"))
-      ->error_messages("no_slashes", t("The movie name can't contain a \"/\""))
-      ->error_messages("no_trailing_period", t("The movie name can't end in \".\""))
-      ->error_messages("illegal_data_file_extension", t("You cannot change the movie file extension"))
-      ->error_messages("required", t("You must provide a movie file name"))
-      ->error_messages("length", t("Your movie file name is too long"));
-    $group->input("slug")->label(t("Internet Address"))->value($movie->slug)
-      ->error_messages(
-        "conflict", t("There is already a movie, photo or album with this internet address"))
-      ->error_messages(
-        "not_url_safe",
-        t("The internet address should contain only letters, numbers, hyphens and underscores"))
-      ->error_messages("required", t("You must provide an internet address"))
-      ->error_messages("length", t("Your internet address is too long"));
-
-    module::event("item_edit_form", $movie, $form);
-
-    $group = $form->group("buttons")->label("");
-    $group->submit("")->value(t("Modify"));
-
-    return $form;
-  }
-
-  static function extract_frame($input_file, $output_file) {
-    $ffmpeg = self::find_ffmpeg();
-    if (empty($ffmpeg)) {
-      // BEGIN rWatcher Edit.
-      copy(MODPATH . "noffmpeg/images/missing_movie.png", $output_file);
-      //throw new Exception("@todo MISSING_FFMPEG");
-      // END rWatcher Edit.
-    }
-
-    $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) .
-      " -an -ss 00:00:03 -an -r 1 -vframes 1" .
-      " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
-    exec($cmd);
-
-    clearstatcache();  // use $filename parameter when PHP_version is 5.3+
-    if (filesize($output_file) == 0) {
-      // Maybe the movie is shorter, fall back to the first frame.
-      $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) .
-        " -an -an -r 1 -vframes 1" .
-        " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
-      exec($cmd);
-
-      clearstatcache();
-      if (filesize($output_file) == 0) {
-        throw new Exception("@todo FFMPEG_FAILED");
-      }
-    }
-  }
-
-  static function find_ffmpeg() {
-    if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
-      $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
-
-      putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-             ":/usr/local/bin:/opt/local/bin:/opt/bin");
-      if (function_exists("exec")) {
-        $ffmpeg_path = exec("which ffmpeg");
-      }
-
-      module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
-    }
-    return $ffmpeg_path;
-  }
-
-
-  /**
-   * Return the width, height, mime_type and extension of the given movie file.
-   */
-  static function get_file_metadata($file_path) {
-    $ffmpeg = self::find_ffmpeg();
-    if (empty($ffmpeg)) {
-      // BEGIN rWatcher Edit.
-      $pi = pathinfo($file_path);
-      $extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension?  Assume FLV.
-      $mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ?
-        "video/mp4" : "video/x-flv";
-      return array(320, 240, $mime_type, $extension);
-      //throw new Exception("@todo MISSING_FFMPEG");
-      // END rWatcher Edit.
-    }
-
-    $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($file_path) . " 2>&1";
-    $result = `$cmd`;
-    if (preg_match("/Stream.*?Video:.*?(\d+)x(\d+)/", $result, $regs)) {
-      list ($width, $height) = array($regs[1], $regs[2]);
-    } else {
-      list ($width, $height) = array(0, 0);
-    }
-
-    $pi = pathinfo($file_path);
-    $extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension?  Assume FLV.
-    $mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ?
-      "video/mp4" : "video/x-flv";
-
-    return array($width, $height, $mime_type, $extension);
-  }
-
-}
diff --git a/modules/noffmpeg/images/missing_movie.png b/modules/noffmpeg/images/missing_movie.png
deleted file mode 100644
index fdc97779..00000000
Binary files a/modules/noffmpeg/images/missing_movie.png and /dev/null differ
diff --git a/modules/noffmpeg/module.info b/modules/noffmpeg/module.info
deleted file mode 100644
index c11f0853..00000000
--- a/modules/noffmpeg/module.info
+++ /dev/null
@@ -1,3 +0,0 @@
-name = "NoFFMPEG"
-description = "Allow video uploads on systems without FFMPEG."
-version = 1