diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index 6f66c133d2a92a89ae561c08c247ad8a446b9a96..fafc8f2752135a48647963f406cfdfb2b235e7c2 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -361,40 +361,6 @@ class SimpleSAML_Session {
 	}
 
 
-	/**
-	 * Set our current NameID.
-	 *
-	 * @param array|NULL $nameid The NameID we received from the IdP
-	 * @deprecated
-	 */
-	public function setNameID($nameid) {
-		assert('is_array($nameid) || is_null($nameid)');
-		assert('isset($this->authData[$this->authority])');
-
-		SimpleSAML_Logger::debug('Library - Session: Set nameID: ');
-		$this->dirty = true;
-		if ($nameid !== NULL) {
-			$this->authData[$this->authority]['saml:sp:NameID'] = $nameid;
-		} else {
-			unset($this->authData[$this->authority]['saml:sp:NameID']);
-		}
-	}
-
-
-	/**
-	 * Get our NameID.
-	 *
-	 * @return array|NULL The NameID we received from the IdP.
-	 * @deprecated
-	 */
-	public function getNameID() {
-		if (!isset($this->authData[$this->authority]['saml:sp:NameID'])) {
-			return NULL;
-		}
-		return $this->authData[$this->authority]['saml:sp:NameID'];
-	}
-
-
 	/**
 	 * Set remember me expire time.
 	 *