diff --git a/app/assets/images/icons/cubbies.png b/app/assets/images/icons/cubbies.png
deleted file mode 100644
index 6111997c7..000000000
Binary files a/app/assets/images/icons/cubbies.png and /dev/null differ
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 17cf713b0..9568f2edb 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -1068,17 +1068,6 @@ h1.tag
   :font
     :style italic
 
-.cubbies_steps
-  li
-    :margin
-      :bottom 12px
-    :vertical-align top
-
-.cubbies-settings-image
-  @include box-shadow(3px, 3px, 15px, #333)
-  :margin
-    :bottom 5px
-
 .button.sign_up
   @include linear-gradient(#D9FFA9,#B9E68A)
   :text-shadow none
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 0df1e38a9..5d14b8b0b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -253,10 +253,6 @@ en:
         any_problem: "Any Problem?"
         contact_podmin: "Contact the administrator of your pod!"
         mail_podmin: "Podmin E-Mail"
-      cubbies:
-        heading: "Connect to Cubbi.es"
-        explanation: "Cubbi.es is the first Diaspora application under development."
-        learn_more: "Learn more"
       diaspora_id:
         heading: "Diaspora ID"
         content_1: "Your Diaspora ID is:"
@@ -1123,28 +1119,6 @@ en:
       success: "Alas! You aren't following #%{name} anymore."
       failure: "Failed to stop following #%{name}. Maybe you already stopped following it?"
 
-  tokens:
-    show:
-      connect_to_cubbies: "Connect to Cubbi.es"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      love_to_try: "We'd love for you to try it out."
-      sign_up_today: "Sign up today!"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      typical_userpage: "A typical cubbi.es userpage"
-      daniels_account: "Daniel's Diaspora account"
-      making_the_connection: "Making the Connection"
-      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
-      via: "(via %{link})"
-
-  authorizations:
-    index:
-      revoke_access: "Revoke Access"
-      no_applications: "You haven't registered any applications yet."
-    new:
-      cubbies_will: "Cubbies will be able to post photos on your behalf"
-      authorize: "Authorize"
-      nope: "No"
-
   streams:
     community_spotlight_stream: "Community Spotlight"
     aspects_stream: "Aspects"
diff --git a/config/routes.rb b/config/routes.rb
index 70e376620..a40fd9131 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,10 +87,6 @@ Diaspora::Application.routes.draw do
 
   resources :apps, :only => [:show]
 
-  #Cubbies info page
-
-  resource :token, :only => :show
-
   # Users and people
 
   resource :user, :only => [:edit, :update, :destroy], :shallow => true do