diff --git a/Session.php b/Session.php
index 721a6c724..072287799 100644
--- a/Session.php
+++ b/Session.php
@@ -32,7 +32,9 @@ class Session implements \Serializable
     /**
      * Constructor.
      *
-     * @param SessionStorageInterface $storage A SessionStorageInterface instance
+     * @param \Symfony\Component\HttpFoundation\SessionStorage\SessionStorageInterface $storage A SessionStorageInterface instance
+     * @return \Symfony\Component\HttpFoundation\Session
+     *
      */
     public function __construct(SessionStorageInterface $storage)
     {
@@ -109,10 +111,7 @@ public function get($name, $default = null)
      */
     public function set($name, $value)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         $this->attributes[$name] = $value;
     }
 
@@ -137,10 +136,7 @@ public function all()
      */
     public function replace(array $attributes)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         $this->attributes = $attributes;
     }
 
@@ -153,13 +149,8 @@ public function replace(array $attributes)
      */
     public function remove($name)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
-        if (array_key_exists($name, $this->attributes)) {
-            unset($this->attributes[$name]);
-        }
+        $this->start();
+        unset($this->attributes[$name]);
     }
 
     /**
@@ -169,9 +160,7 @@ public function remove($name)
      */
     public function clear()
     {
-        if (false === $this->started) {
-            $this->start();
-        }
+        $this->start();
 
         $this->attributes = array();
         $this->flashes = array();
@@ -208,10 +197,7 @@ public function migrate()
      */
     public function getId()
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         return $this->storage->getId();
     }
 
@@ -232,10 +218,7 @@ public function getFlashes()
      */
     public function setFlashes($values)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         $this->flashes = $values;
         $this->oldFlashes = array();
     }
@@ -261,10 +244,7 @@ public function getFlash($name, $default = null)
      */
     public function setFlash($name, $value)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         $this->flashes[$name] = $value;
         unset($this->oldFlashes[$name]);
     }
@@ -278,10 +258,7 @@ public function setFlash($name, $value)
      */
     public function hasFlash($name)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         return array_key_exists($name, $this->flashes);
     }
 
@@ -292,10 +269,7 @@ public function hasFlash($name)
      */
     public function removeFlash($name)
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         unset($this->flashes[$name]);
     }
 
@@ -304,19 +278,14 @@ public function removeFlash($name)
      */
     public function clearFlashes()
     {
-        if (false === $this->started) {
-            $this->start();
-        }
-
+        $this->start();
         $this->flashes = array();
         $this->oldFlashes = array();
     }
 
     public function save()
     {
-        if (false === $this->started) {
-            $this->start();
-        }
+        $this->start();
 
         $this->flashes = array_diff_key($this->flashes, $this->oldFlashes);