diff --git a/frontend/src/Main.elm b/frontend/src/Main.elm
index dfb721d..efb81af 100644
--- a/frontend/src/Main.elm
+++ b/frontend/src/Main.elm
@@ -31,8 +31,6 @@ type alias Model =
     , url : Url.Url
     , token : Maybe String
     , token_data : Maybe TokenData
-    , switch_cursor : ( Int, Int )
-    , switch_data : Maybe (List SwitchData.Switch)
     }
 
 
@@ -43,8 +41,6 @@ init flags url key =
         url
         Nothing
         Nothing
-        ( 40, 0 )
-        Nothing
     , Cmd.none
     )
 
@@ -75,7 +71,11 @@ update msg model =
         UrlChanged url ->
             case url.path of
                 "/logout" ->
-                    ( model, Nav.load "/" )
+                    ( { model | token = Nothing, token_data = Nothing }
+                    , Nav.pushUrl
+                        model.key
+                        "/"
+                    )
 
                 default ->
                     ( { model | url = url }
diff --git a/frontend/src/Page.elm b/frontend/src/Page.elm
index 508bec2..96e7961 100644
--- a/frontend/src/Page.elm
+++ b/frontend/src/Page.elm
@@ -6,25 +6,6 @@ import Html.Attributes exposing (href, placeholder, type_, value)
 import Html.Events exposing (onInput)
 
 
-type Page
-    = Login
-    | TokenData
-    | NotFound String
-
-
-fromPath : String -> Page
-fromPath path =
-    case path of
-        "/" ->
-            TokenData
-
-        "/login" ->
-            Login
-
-        other ->
-            NotFound other
-
-
 template : String -> List (Html msg) -> Browser.Document msg
 template title body =
     { title = title
diff --git a/frontend/src/Page/Token.elm b/frontend/src/Page/Token.elm
index 29611f5..4f4d030 100644
--- a/frontend/src/Page/Token.elm
+++ b/frontend/src/Page/Token.elm
@@ -26,14 +26,14 @@ init =
 
 
 type Msg
-    = GotToken String
+    = Init
     | GotTokenData (Result Http.Error TokenData)
 
 
-update : Msg -> Model -> ( Model, Cmd Msg )
-update msg model =
+update : Msg -> String -> Model -> ( Model, Cmd Msg )
+update msg token model =
     case msg of
-        GotToken token ->
+        Init ->
             ( { model | token = Just token }
             , Mi.request
                 "GET"