Removed session expiry because it's not yet working