diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index bd117f7a0..494139356 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -4,4 +4,4 @@
     = f.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
   = f.hidden_field :post_id, :value => post.id
   %p{:style => "text-align:right;"}
-    = f.submit "Comment", :class => "comment_submit"
+    = f.submit "Comment", :class => "comment_submit button"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5fe36a67a..bb508be56 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -13,13 +13,14 @@
     = stylesheet_link_tag "fileuploader" 
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery-1.4.2.min', 'rails', 'google'
+    = javascript_include_tag 'jquery-1.4.2.min', 'rails'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
     
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
     = javascript_include_tag 'fileuploader'
 
-    = javascript_include_tag 'view', 'image_picker', 'aspect_nav', 'stream'
+    = javascript_include_tag 'view', 'image_picker', 'stream'
+
     = render 'js/websocket_js'
     
     = csrf_meta_tag
diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index 75a2e9fe8..ab3e35087 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -3,7 +3,6 @@
   <Subject>acct:<%=@person.email%></Subject>
   <Alias>"<%= @person.url %>"</Alias>
   <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>/hcard/users/<%=@person.id%>"/>
-  <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@person.url%>status_messages.atom"/>
   <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/>
   <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.id%>"/>
   <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.encode64(@person.exported_key)%>"/>
diff --git a/public/javascripts/aspect_nav.js b/public/javascripts/aspect_nav.js
deleted file mode 100644
index 5f5347c31..000000000
--- a/public/javascripts/aspect_nav.js
+++ /dev/null
@@ -1,14 +0,0 @@
-$(document).ready( function() {
-
-  var vars = [], hash;
-  var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-  for(var i = 0; i < hashes.length; i++)
-  {
-      hash = hashes[i].split('=');
-      vars.push(hash[0]);
-      vars[hash[0]] = hash[1];
-  }
-
-  $("."+vars['g']).addClass('selected');
-
-});
diff --git a/public/javascripts/google.js b/public/javascripts/google.js
deleted file mode 100644
index b544a8075..000000000
--- a/public/javascripts/google.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-17207587-1']);
-_gaq.push(['_setDomainName', '.joindiaspora.com']);
-_gaq.push(['_trackPageview']);
-
-(function() {
-  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
\ No newline at end of file