Removes redundant login/logout link from GCI main menu.
diff --git a/app/soc/modules/gci/views/base_templates.py b/app/soc/modules/gci/views/base_templates.py
index 77da920..c4b735b 100644
--- a/app/soc/modules/gci/views/base_templates.py
+++ b/app/soc/modules/gci/views/base_templates.py
@@ -55,14 +55,6 @@
       'help_link': redirect.document(help_page).url(),
   }
 
-  # TODO(nathaniel): This should be the one canonical application-wide
-  # linker object rather than a one-off instantiation.
-  linker = links.Linker()
-  if data.gae_user:
-    context['logout_link'] = linker.logout(data.request)
-  else:
-    context['login_link'] = linker.login(data.request)
-
   if data.profile:
     context['dashboard_link'] = redirect.dashboard().url()
 
diff --git a/app/soc/templates/modules/gci/_mainmenu.html b/app/soc/templates/modules/gci/_mainmenu.html
index a44e510..6f324fc 100644
--- a/app/soc/templates/modules/gci/_mainmenu.html
+++ b/app/soc/templates/modules/gci/_mainmenu.html
@@ -4,9 +4,6 @@
     {% if home_link %}
     <li id="menu-home"><a href="{{ home_link }}">Home</a></li>
     {% endif %}
-    {% if login_link %}
-    <li id="menu-login"><a href="{{ login_link }}">Login</a></li>
-    {% endif %}
     {% if register_as_student_link %}
     <li id="menu-help"><a href="{{ register_as_student_link }}">Register as a Student</a></li>
     {% endif %}
@@ -53,8 +50,5 @@
     {% if help_link %}
     <li id="menu-help"><a href="{{ help_link }}">FAQ</a></li>
     {% endif %}
-    {% if logout_link %}
-    <li id="menu-logout"><a href="{{ logout_link }}">Logout</a></li>
-    {% endif %}
   </ul>
 {% endblock site_menu %}