diff --git a/inc/media.php b/inc/media.php
index 9d3e90a54b8ca738a25db271a08d1b8da28e98ad..07351e48b9caf8d21e3a8e1ba97714a4cfd16f5a 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -332,7 +332,7 @@ function media_save($file, $id, $ow, $auth, $move) {
     global $lang, $conf;
 
     // get filename
-    $id   = cleanID($id,false,true);
+    $id   = cleanID($id);
     $fn   = mediaFN($id);
 
     // get filetype regexp
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 31b5f9ff94ac9de58479d29b610352ee9ab2b106..151fa59878543df52d1424d743631f7c8fba9c05 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -92,7 +92,7 @@ function getID($param='id',$clean=true){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @param  string  $raw_id    The pageid to clean
  * @param  boolean $ascii     Force ASCII
- * @param  boolean $media     Allow leading or trailing _ for media files
+ * @param  boolean $media     DEPRECATED
  */
 function cleanID($raw_id,$ascii=false,$media=false){
     global $conf;
@@ -132,7 +132,7 @@ function cleanID($raw_id,$ascii=false,$media=false){
     //clean up
     $id = preg_replace($sepcharpat,$sepchar,$id);
     $id = preg_replace('#:+#',':',$id);
-    $id = ($media ? trim($id,':.-') : trim($id,':._-'));
+    $id = trim($id,':._-');
     $id = preg_replace('#:[:\._\-]+#',':',$id);
     $id = preg_replace('#[:\._\-]+:#',':',$id);
 
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index f8d62cb577353fb47da16a11d891a9e2ea8141e2..8edd559d6e5098e14f54c77261006fcff170254b 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -257,7 +257,7 @@ function ajax_mediaupload(){
         $id = $_GET['qqfile'];
     }
 
-    $id = cleanID($id, false, true);
+    $id = cleanID($id);
 
     $NS = $_REQUEST['ns'];
     $ns = $NS.':'.getNS($id);