diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php
deleted file mode 100644
index 8d6f75fab..000000000
--- a/core/lib/Thelia/Model/Rewriting.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\Rewriting as BaseRewriting;
-
-class Rewriting extends BaseRewriting {
-
-}
diff --git a/core/lib/Thelia/Model/RewritingQuery.php b/core/lib/Thelia/Model/RewritingQuery.php
deleted file mode 100644
index df2cc6161..000000000
--- a/core/lib/Thelia/Model/RewritingQuery.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Thelia\Model;
-
-use Thelia\Model\Base\RewritingQuery as BaseRewritingQuery;
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'rewriting' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- */
-class RewritingQuery extends BaseRewritingQuery {
-
-} // RewritingQuery
diff --git a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
index 6ab24fbc4..f50da56d5 100644
--- a/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
+++ b/core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
@@ -23,6 +23,8 @@
 
 namespace Thelia\Model\Tools;
 
+use Thelia\Exception\UrlRewritingException;
+use Thelia\Model\Rewriting;
 use Thelia\Tools\URL;
 /**
  * A trait for managing Rewriten URLs from model classes
@@ -51,7 +53,26 @@ trait UrlRewritingTrait {
      */
     public function generateRewritenUrl($locale)
     {
-        URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle());
+        // Borrowed from http://stackoverflow.com/questions/2668854/sanitizing-strings-to-make-them-url-and-filename-safe
+
+        $this->setLocale($locale);
+        // Replace all weird characters with dashes
+        $string = preg_replace('/[^\w\-~_\.]+/u', '-', $this->getTitle());
+
+        // Only allow one dash separator at a time (and make string lowercase)
+        $cleanString = mb_strtolower(preg_replace('/--+/u', '-', $string), 'UTF-8');
+
+        $urlFilePart = $cleanString . ".html";
+
+        // TODO :
+        // check if URL url already exists, and add a numeric suffix, or the like
+        try{
+            URL::getInstance()->resolve($urlFilePart);
+        } catch (UrlRewritingException $e) {
+
+        }
+        // insert the URL in the rewriting table
+        //URL::getInstance()->generateRewritenUrl($this->getRewritenUrlViewName(), $this->getId(), $locale, $this->getTitle());
     }
 
     /**