diff --git a/repository/draft/db/access.php b/repository/draft/db/access.php
deleted file mode 100644
index f0096d73961..00000000000
--- a/repository/draft/db/access.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-$capabilities = array(
-
-    'repository/draft:view' => array(
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'legacy' => array(
-            'student' => CAP_ALLOW,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    )
-);
diff --git a/repository/draft/db/install.php b/repository/draft/db/install.php
deleted file mode 100755
index c2e6f391448..00000000000
--- a/repository/draft/db/install.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-function xmldb_repository_draft_install() {
-    global $CFG;
-    $result = true;
-    require_once($CFG->dirroot.'/repository/lib.php');
-    $draft_plugin = new repository_type('draft', array(), true);
-    if(!$id = $draft_plugin->create(true)) {
-        $result = false;
-    }
-    return $result;
-}
diff --git a/repository/draft/db/upgrade.php b/repository/draft/db/upgrade.php
deleted file mode 100755
index 4fa6b60bb92..00000000000
--- a/repository/draft/db/upgrade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-function xmldb_repository_draft_upgrade($oldversion) {
-
-    global $CFG, $DB;
-
-    $dbman = $DB->get_manager();
-    $result = true;
-
-/// And upgrade begins here. For each one, you'll need one
-/// block of code similar to the next one. Please, delete
-/// this comment lines once this file start handling proper
-/// upgrade code.
-
-/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
-///     $result = result of database_manager methods
-/// }
-
-    return $result;
-}
diff --git a/repository/draft/icon.png b/repository/draft/icon.png
deleted file mode 100755
index 5131cf3de1d..00000000000
Binary files a/repository/draft/icon.png and /dev/null differ
diff --git a/repository/draft/repository.class.php b/repository/draft/repository.class.php
deleted file mode 100755
index 619f608baf2..00000000000
--- a/repository/draft/repository.class.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * repository_draft class
- * This is a subclass of repository class
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-class repository_draft extends repository {
-
-    /**
-     * @param int $repositoryid
-     * @param int $context
-     * @param array $options
-     */
-    public function __construct($repositoryid, $context = SITEID, $options = array()) {
-        parent::__construct($repositoryid, $context, $options);
-    }
-
-    /**
-     * @param boolean $ajax
-     * @return mixed
-     */
-    public function print_login() {
-        return $this->get_listing();
-    }
-
-    /**
-     *
-     * @param string $path
-     * @param string $path not used by this plugin
-     * @return mixed
-     */
-    public function get_listing($path = '/', $page = '') {
-        global $CFG, $USER, $itemid, $OUTPUT;
-        $ret = array();
-        $ret['dynload'] = true;
-        $ret['nosearch'] = true;
-        $ret['nologin'] = true;
-        $ret['draftfiles'] = true;
-        $list = array();
-        if (empty($path)) {
-            $path = '/';
-        }
-
-        $fs = get_file_storage();
-        $user_context = get_context_instance(CONTEXT_USER, $USER->id);
-        $files = $fs->get_directory_files($user_context->id, 'user_draft', $itemid, $path, false);
-        foreach ($files as $file) {
-            if ($file->get_filename()!='.') {
-                $node = array(
-                    'title' => $file->get_filename(),
-                    'size' => 0,
-                    'date' => '',
-                    'source'=> $file->get_id(),
-                    'thumbnail' => $OUTPUT->old_icon_url('f/text-32')
-                );
-                $list[] = $node;
-            } else {
-                $foldername = explode('/', trim($file->get_filepath(), '/'));
-                $foldername = trim(array_pop($foldername), '/');
-                $node = array(
-                    'title' => $foldername,
-                    'size' => 0,
-                    'date' => '',
-                    'path' => $file->get_filepath(),
-                    'children' => array(),
-                    'thumbnail' => $OUTPUT->old_icon_url('f/folder-32')
-                );
-                $list[] = $node;
-            }
-        }
-        $ret['list'] = $list;
-        return $ret;
-    }
-
-     /**
-     * Return draft files information
-     *
-     * @global object $USER
-     * @param string $fid file id
-     * @param string $title
-     * @param string $itemid
-     * @return string the location of the file
-     */
-    public function move_to_draft($fid, $title = '', $itemid = '') {
-        global $USER;
-        $ret = array();
-        $browser = get_file_browser();
-        $user_context = get_context_instance(CONTEXT_USER, $USER->id);
-        $ret['itemid'] = $itemid;
-        $ret['title']  = $title;
-        $ret['contextid'] = $user_context->id;
-        return $ret;
-    }
-
-    /**
-     *
-     * @return string  repository name
-     */
-    public function get_name(){
-        return get_string('repositoryname', 'repository_draft');;
-    }
-    public function supported_returntypes() {
-        return (FILE_INTERNAL | FILE_EXTERNAL);
-    }
-}
-
diff --git a/repository/draft/version.php b/repository/draft/version.php
deleted file mode 100755
index 868025bd14c..00000000000
--- a/repository/draft/version.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-$plugin->version = 2009080101;
diff --git a/repository/repository.src.js b/repository/repository.src.js
index b9f8a99b518..d5e612fad3f 100644
--- a/repository/repository.src.js
+++ b/repository/repository.src.js
@@ -1073,7 +1073,8 @@ repository_client.end = function(client_id, obj) {
         repository_client.files[client_id] = 0;
     }
     if(fp.env=='filepicker') {
-        fp.target.value = obj['id'];
+        if (fp.target)
+            fp.target.value = obj['id'];
     }else if(fp.env=='editor'){
         if (obj['type'] == 'link') {
             fp.target.value = obj['url']+'#'+new_filename;
diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
index b16366a531e..f8da83146bd 100755
--- a/repository/repository_ajax.php
+++ b/repository/repository_ajax.php
@@ -65,28 +65,6 @@
 
 /// Check for actions that do not need repository ID
     switch ($action) {
-        // delete a file from filemanger
-        case 'delete':
-            try {
-                if (!$context = get_context_instance(CONTEXT_USER, $USER->id)) {
-                }
-                $contextid = $context->id;
-                $fs = get_file_storage();
-                if ($file = $fs->get_file($contextid, 'user_draft', $itemid, '/', $title)) {
-                    if($result = $file->delete()) {
-                        echo $client_id;
-                    } else {
-                        echo '';
-                    }
-                } else {
-                    echo '';
-                }
-                exit;
-            } catch (repository_exception $e) {
-                $err->e = $e->getMessage();
-                die(json_encode($err));
-            }
-            break;
         case 'gsearch': //  Global Search
             $params = array();
             $params['context'] = array(get_context_instance_by_id($contextid), get_system_context());
@@ -230,7 +208,7 @@ EOD;
         case 'download':
             try {
                 // we have two special repoisitory type need to deal with
-                if ($repo->options['type'] == 'local' or $repo->options['type'] == 'draft') {
+                if ($repo->options['type'] == 'local') {
                     $fileinfo = $repo->move_to_draft($file, $title, $itemid, $save_path);
                     $info = array();
                     $info['client_id'] = $client_id;