2 files changed, 4 insertions, 17 deletions

diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index 6e2c046b..8c2f38e3 100644
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -11,8 +11,8 @@
 class Routing
 {
     protected $wallabag;
-    public $referer;
-    public $view;
+    protected $referer;
+    protected $view;
     protected $action;
     protected $id;
     protected $url;
@@ -55,7 +55,7 @@ class Routing
         # because messages can be added in $poche->action(), we have to add this entry now (we can add it before)
         $this->vars = array_merge($this->vars, array('messages' => $this->wallabag->messages->display('all', FALSE)));
 
-        $this->render($this->file, $this->vars);
+        $this->_render($this->file, $this->vars);
     }
 
     private function _defineTplInformation()
@@ -142,7 +142,7 @@ class Routing
         }
     }
 
-    public function render($file, $vars)
+    public function _render($file, $vars)
     {
         echo $this->wallabag->tpl->render($file, $vars);
     }
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 9d710b6c..3eb64df0 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -40,12 +40,6 @@ require_once INCLUDES . '/3rdparty/libraries/PHPePub/Logger.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPub.php';
 require_once INCLUDES . '/3rdparty/libraries/PHPePub/EPubChapterSplitter.php';
 
-require_once INCLUDES . '/3rdparty/PicoFarad/Request.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Response.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Router.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Session.php';
-require_once INCLUDES . '/3rdparty/PicoFarad/Template.php';
-
 # system configuration; database credentials et caetera
 require_once INCLUDES . '/poche/config.inc.php';
 require_once INCLUDES . '/poche/config.inc.default.php';
@@ -61,10 +55,3 @@ if (!ini_get('date.timezone') || !@date_default_timezone_set(ini_get('date.timez
 if (defined('ERROR_REPORTING')) {
     error_reporting(ERROR_REPORTING);
 }
-
-// Start session
-Session::$sessionName = 'wallabag';
-Session::init();
-
-// Let's rock !
-$wallabag = new Poche();