diff --git a/app/controllers/friends_controller.rb b/app/controllers/friends_controller.rb
deleted file mode 100644
index dbe7bc41429133dcb2bc0e91ad456756eab66a1b..0000000000000000000000000000000000000000
--- a/app/controllers/friends_controller.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-class FriendsController < ApplicationController
-  before_filter :authenticate_user!
-  
-  def index
-    @friends = Friend.paginate :page => params[:page], :order => 'created_at DESC'
-  end
-  
-  def show
-    @friend = Friend.where(:id => params[:id]).first
-    @friend_profile = @friend.profile
-    @friend_posts = Post.where(:person_id => @friend.id).sort(:created_at.desc)
-  end
-  
-  def destroy
-    @friend = Friend.where(:id => params[:id]).first
-    @friend.destroy
-    flash[:notice] = "Successfully destroyed friend."
-    redirect_to friends_url
-  end
-  
-  def new
-    @friend = Friend.new
-    @profile = Profile.new
-  end
-  
-  def create
-   
-    puts params.inspect
-    @friend = Friend.new(params[:friend])
-
-
-    if @friend.save
-      flash[:notice] = "Successfully created friend."
-      redirect_to @friend
-    else
-      render :action => 'new'
-    end
-  end
-end
diff --git a/app/views/friend_requests/_form.html.haml b/app/views/friend_requests/_form.html.haml
deleted file mode 100644
index f9d962221c19700a6dce50929524544d1b75c593..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/_form.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= form_for @friend_request do |f|
-  = f.error_messages
-
-  %p
-    f.submit
diff --git a/app/views/friend_requests/_friend_request.html.haml b/app/views/friend_requests/_friend_request.html.haml
deleted file mode 100644
index f61edbeca5266e274af94783189c6238cb9cb95c..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/_friend_request.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%li.message{:id => friend_request.id}
-
-  = friend_request.inspect
diff --git a/app/views/friend_requests/_new_friend_request.haml b/app/views/friend_requests/_new_friend_request.haml
deleted file mode 100644
index f208c8ff404b33547a7813b24cecffec9a7a4ff7..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/_new_friend_request.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-= form_for @friend_request, :remote => true do |f|
-  = f.error_messages
-  %p
-    = f.submit
diff --git a/app/views/friend_requests/edit.html.haml b/app/views/friend_requests/edit.html.haml
deleted file mode 100644
index 11421d0ba0924014959228b6a3c46e289b44ff91..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/edit.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-- title "Edit Bookmark"
-
-= render 'form'
-
-%p
-  = link_to "Show", bookmark_path(@bookmark)
-  |
-  = link_to "View All", bookmarks_path
diff --git a/app/views/friend_requests/index.html.haml b/app/views/friend_requests/index.html.haml
deleted file mode 100644
index c7091fcbf0c23da57e625cb8ebee7069763c496b..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/index.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%h1 friend requests
-= render "friend_requests/new_friend_request", :friend_request => @friend_request
-%ul#stream
-  - for friend_request in @friend_requests
-    = render "friend_request", :friend_request => friend_request
-#pagination
-  = will_paginate @friend_requests
diff --git a/app/views/friend_requests/new.html.haml b/app/views/friend_requests/new.html.haml
deleted file mode 100644
index c799efe573d6bac34a0d31592d73c17de94868b3..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/new.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- title "New Friend Request"
-
-= render 'form'
-
-%p= link_to "Back to List", friend_requests_path 
diff --git a/app/views/friend_requests/show.html.haml b/app/views/friend_requests/show.html.haml
deleted file mode 100644
index e4a4821565ca4e07d1d132c0164014175ff48e35..0000000000000000000000000000000000000000
--- a/app/views/friend_requests/show.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-- title "Friend Request"
-
-%p
-  = friend_request.inspect
-
-%p
-  = link_to "Edit", edit_friend_request_path(@bookmark)
-  |
-  = link_to "Destroy", @friend_request, :confirm => 'Are you sure?', :method => :delete
-  |
-  = link_to "View All", friend_requests_path