diff --git a/tracks/app/views/context/_show_items.rhtml b/tracks/app/views/context/_show_items.rhtml
deleted file mode 100644
index 1bb6feaf..00000000
--- a/tracks/app/views/context/_show_items.rhtml
+++ /dev/null
@@ -1,100 +0,0 @@
-<%   item = show_items %>
-
-<% if !item.completed? %>
-<div id="item-<%= item.id %>-container">
-<%= form_remote_tag( :url => url_for( :controller => "context", :action => "toggle_check", :id => item.id ),
-                     :html => { :id=> "checkbox-notdone-#{item.id}", :class => "inline-form" },
-                     :update => "completed",
-                     :position => "top",
-                     :loading => "Form.disable('checkbox-notdone-#{item.id}');",
-                     :complete => visual_effect(:fade, "item-#{item.id}-container") 
-                     ) %>
-
-<div id="item-<%= item.id %>">
-  <div class="big-box">
-  <%=
-  link_to_remote( image_tag("blank", :title =>"Delete this action", :class=>"delete_item"), 
-                    :update => "item-#{item.id}-container",
-                    :loading => visual_effect(:fade, "item-#{item.id}-container"),
-                    :url => { :controller => "todo", :action => "destroy", :id => item.id }, :confirm => "Are you sure that you want to delete the action \'#{item.description}\'?" ) + " " +
-  link_to_function(image_tag( "blank", :title => "Edit item", :class=>"edit_item"), "Element.toggle('item-#{item.id}','action-#{item.id}-edit-form'); new Effect.Appear('action-#{item.id}-edit-form'); Form.focusFirstElement('form-action-#{item.id}');" ) + " "
-  %>
-  <!-- begin div.checkbox -->
-  <div class="checkbox">
-    <input type="checkbox" name="item_id" value="<%= item.id %>" onclick="document.forms['checkbox-notdone-<%= item.id %>'].onsubmit();" />
-  </div>
-  <!-- end div.checkbox -->
-  </div>
-  <!-- start of div which has a class 'description' or 'stale_7d', 'stale_14d' etc -->
-  <% if item.due %>
-    <div class="description">
-  <% else %>
-    <%= staleness( item ) %>
-  <% end %>
-  <%= due_date( item.due ) %> 
-  <%= sanitize(item.description) %>
-  <% if item.project_id %>
-    <%= link_to( "[P]", { :controller => "project", :action => "show", :name => urlize(item.project.name) }, :title => "View project: #{item.project.name}" ) %>
-  <% end %>
-  <% if item.notes? %>
-  <%= "<a href=\"javascript:Element.toggle('" + item.id.to_s + "')\" class=\"show_notes\" title=\"Show notes\">" + image_tag( "blank", :width=>"16", :height=>"16", :border=>"0" ) + "</a>" %>
-    <%   m_notes = sanitize(markdown( item.notes )) %>
-    <%= "<div class=\"notes\" id=\"" + item.id.to_s + "\" style=\"display:none\">" + m_notes + "</div>" %>
-  <% end %>
-  </div>
-</div><!-- [end:item-item.id] -->
-<%= end_form_tag %>
-
-<div id="action-<%= item.id %>-edit-form" class="edit-form" style="display:none;">
-<%= form_remote_tag  :url => { :controller => 'todo', :action => 'update', :id => item.id },
-               :html => { :id => "form-action-#{item.id}", :class => "inline-form" },
-               :update => "item-#{item.id}-container",
-               :complete => visual_effect(:appear, "item-#{item.id}-container") %>
-              
-  <%= render :partial => 'todo/action_edit_form', :object => item %>
-<%= end_form_tag %>
-</div><!-- [end:action-item.id-edit-form] -->
-
-</div><!-- [end:item-item.id-container] -->
-<% else %>
-<div id="done-item-<%= item.id %>-container">
-<%= form_remote_tag( :url => url_for( :controller => "context", :action => "toggle_check", :id => item.id, :_source_view => source_view),
-                     :html => { :id=> "checkbox-done-#{item.id}", :class => "inline-form" },
-                     :update => "next_actions",
-                     :position => "bottom",
-                     :loading => "Form.disable('checkbox-done-#{item.id}');",
-                     :complete => visual_effect(:fade, "done-item-#{item.id}-container")
-                     ) %>
-
-<div id="done-item-<%= item.id %>">
-  <div class="big-box">
-  <%=
-  link_to_remote( image_tag("blank", :title =>"Delete this action", :class=>"delete_item"), 
-                  :update => "done-item-#{item.id}-container",
-                  :loading => visual_effect(:fade, "done-item-#{item.id}-container"),
-                  :url => { :controller => "todo", :action => "destroy", :id => item.id, :_source_view => source_view }, :confirm => "Are you sure that you want to delete the action \'#{item.description}\'?" ) + " "
-  %>
-  <%= image_tag("blank") %>
-  </div><!-- [end:big-box] -->
-  <!-- begin div.checkbox -->
-  <div class="checkbox">
-    <input type="checkbox" name="item_id" value="<%= item.id %>" checked="checked" onclick="document.forms['checkbox-done-<%= item.id %>'].onsubmit();" />
-  </div>
-  <!-- end div.checkbox -->
-  <div class="description">
-  <span class="grey"><%= format_date( item.completed_at ) %></span>
-  <%= sanitize(item.description) %>
-  <% if item.project_id %>
-    <%= link_to( "[P]", { :controller => "project", :action => "show", :name => urlize(item.project.name) }, :title => "View project: #{item.project.name}" ) %>
-  <% end %>
-  <% if item.notes? %>
-  <%= "<a href=\"javascript:Element.toggle('" + item.id.to_s + "')\" class=\"show_notes\" title=\"Show notes\">" + image_tag( "blank", :width=>"16", :height=>"16", :border=>"0" ) + "</a>" %>
-    <%   m_notes = sanitize(markdown( item.notes )) %>
-    <%= "<div class=\"notes\" id=\"" + item.id.to_s + "\" style=\"display:none\">" + m_notes + "</div>" %>
-  <% end %>
-  </div><!-- [end:description] -->
-</div><!-- [end:item-item.id] -->
-<%= end_form_tag %>
-</div><!-- [end:item-item.id-container] -->
-<% end %>
-<% item = nil %>
diff --git a/tracks/app/views/context/add_item.rjs b/tracks/app/views/context/add_item.rjs
deleted file mode 100644
index 432d1784..00000000
--- a/tracks/app/views/context/add_item.rjs
+++ /dev/null
@@ -1,12 +0,0 @@
-if @saved
-  page.notify :notice, "Added new next action", 5.0
-  page['badge_count'].replace_html @up_count
-  page.send :record, "Form.reset('todo-form-new-action');Form.focusFirstElement('todo-form-new-action')"
-  page.send :record, "Form.reset('todo-form-new-action-lightbox');Form.focusFirstElement('todo-form-new-action-lightbox')"
-  page.insert_html :bottom, "c#{@item.context_id}", :partial => 'todo/item', :locals => { :parent_container_type => "context", :source_view => 'context' }
-  page.visual_effect :highlight, "item-#{@item.id}-container", :duration => 3
-  page["c#{@item.context_id}empty-nd"].hide # If we are adding an new action, the uncompleted actions must be > 0
-else
-  page.show 'status'
-  page.replace_html 'status', "#{error_messages_for('item')}"
-end
\ No newline at end of file
diff --git a/tracks/app/views/project/_show_items.rhtml b/tracks/app/views/project/_show_items.rhtml
deleted file mode 100644
index 5989e818..00000000
--- a/tracks/app/views/project/_show_items.rhtml
+++ /dev/null
@@ -1,100 +0,0 @@
-<%   item = show_items %>
-<% if !item.completed? %>
-<div id="item-<%= item.id %>-container">
-<%= form_remote_tag( :url => url_for( :controller => "project", :action => "toggle_check", :id => item.id ),
-                     :html => { :id=> "checkbox-notdone-#{item.id}", :class => "inline-form" },
-                     :update => "completed",
-                     :position => "top",
-                     :loading => "Form.disable('checkbox-notdone-#{item.id}');
-                                  Element.hide('message-done');",
-                     :complete => visual_effect(:fade, "item-#{item.id}-container")
-                     ) %>
-
-<div id="item-<%= item.id %>">
-  <div class="big-box">
-  <%=
-  link_to_remote( image_tag("blank", :title =>"Delete action", :class=>"delete_item"), 
-                  :update => "item-#{item.id}-container",
-                  :loading => visual_effect(:fade, "item-#{item.id}-container"),
-                  :url => { :controller => "todo", :action => "destroy", :id => item.id }, :confirm => "Are you sure that you want to delete the action \'#{item.description}\'?" ) + " " +
-  link_to_function(image_tag( "blank", :title => "Edit action", :class => "edit_item"), "Element.toggle('item-#{item.id}','action-#{item.id}-edit-form'); new Effect.Appear('action-#{item.id}-edit-form'); Form.focusFirstElement('form-action-#{item.id}');" ) + " "
-  %>
-  </div>
-  <!-- begin div.checkbox -->
-  <div class="checkbox">
-    <input type="checkbox" name="item_id" value="<%= item.id %>" onclick="document.forms['checkbox-notdone-<%= item.id %>'].onsubmit();" />
-  </div>
-  <!-- end div.checkbox -->
-  <!-- start of div which has a class 'description' or 'stale_7d', 'stale_14d' etc -->
-  <% if item.due %>
-    <div class="description">
-  <% else %>
-    <%= staleness( item ) %>
-  <% end %>
- 
-  <%= due_date( item.due ) %> 
-  <%= sanitize(item.description) %>
-  <% if item.context_id %>
-    <%= link_to( "[C]", { :controller => "context", :action => "show", :name => urlize(item.context.name) }, :title => "View context: #{item.context.name}" ) %>
-  <% end %>
-  <% if item.notes? %>
-  <%= "<a href=\"javascript:Element.toggle('" + item.id.to_s + "')\" class=\"show_notes\" title=\"Show notes\">" + image_tag( "blank", :width=>"16", :height=>"16", :border=>"0" ) + "</a>" %>
-    <%   m_notes = sanitize(markdown( item.notes )) %>
-    <%= "<div class=\"notes\" id=\"" + item.id.to_s + "\" style=\"display:none\">" + m_notes + "</div>" %>
-  <% end %>
-  </div>
-</div><!-- [end:item-item.id] -->
-<%= end_form_tag %>
-
-<div id="action-<%= item.id %>-edit-form" class="edit-form" style="display:none;">
-<%= form_remote_tag  :url => { :controller => 'todo', :action => 'update', :id => item.id },
-               :html => { :id => "form-action-#{item.id}", :class => "inline-form" },
-               :update => "item-#{item.id}-container",
-               :complete => visual_effect(:appear, "item-#{item.id}-container") %>
-  <%= render :partial => 'todo/action_edit_form', :object => item %>
-<%= end_form_tag %>
-</div><!-- [end:action-item.id-edit-form] -->
-
-</div><!-- [end:item-item.id-container] -->
-<% else %>
-<div id="done-item-<%= item.id %>-container">
-<%= form_remote_tag( :url => url_for( :controller => "project", :action => "toggle_check", :id => item.id ),
-                     :html => { :id=> "checkbox-done-#{item.id}", :class => "inline-form" },
-                     :update => "next_actions",
-                     :position => "bottom",
-                     :loading => "Form.disable('checkbox-done-#{item.id}');
-                                  Element.hide('message-notdone');",
-                     :complete => visual_effect(:fade, "done-item-#{item.id}-container")
-                     ) %>
-
-<div id="done-item-<%= item.id %>">
-  <div class="big-box">
-  <%=
-  link_to_remote( image_tag("blank", :title =>"Delete action", :class=>"delete_item"), 
-                  :update => "done-item-#{item.id}-container",
-                  :loading => visual_effect(:fade, "done-item-#{item.id}-container"),
-                  :url => { :controller => "todo", :action => "destroy", :id => item.id }, :confirm => "Are you sure that you want to delete the action \'#{item.description}\'?" ) + " "
-  %>
-  </div><!-- [end:big-box] -->
-  <!-- begin div.checkbox -->
-  <div class="checkbox">
-    <input type="checkbox" name="item_id" value="<%= item.id %>" checked="checked" onclick="document.forms['checkbox-done-<%= item.id %>'].onsubmit();" />
-  </div>
-  <!-- end div.checkbox -->
-  <div class="description">
-  <span class="grey"><%= format_date( item.completed_at ) %></span>
-  <%= sanitize(item.description) %>
-  <% if item.project_id %>
-    <%= link_to( "[C]", { :controller => "context", :action => "show", :name => urlize(item.context.name) }, :title => "View context: #{item.context.name}" ) %>
-  <% end %>
-  <% if item.notes? %>
-  <%= "<a href=\"javascript:Element.toggle('" + item.id.to_s + "')\" class=\"show_notes\" title=\"Show notes\">" + image_tag( "blank", :width=>"16", :height=>"16", :border=>"0" ) + "</a>" %>
-    <%   m_notes = sanitize(markdown( item.notes )) %>
-    <%= "<div class=\"notes\" id=\"" + item.id.to_s + "\" style=\"display:none\">" + m_notes + "</div>" %>
-  <% end %>
-  </div><!-- [end:description] -->
-</div><!-- [end:item-item.id] -->
-<%= end_form_tag %>
-</div><!-- [end:item-item.id-container] -->
-<% end %>
-<% item = nil %>
diff --git a/tracks/app/views/project/add_item.rjs b/tracks/app/views/project/add_item.rjs
deleted file mode 100644
index 062934ca..00000000
--- a/tracks/app/views/project/add_item.rjs
+++ /dev/null
@@ -1,12 +0,0 @@
-if @saved
-  page.notify :notice, "Added new next action", 5.0
-  page['badge_count'].replace_html @up_count
-  page.send :record, "Form.reset('todo-form-new-action');Form.focusFirstElement('todo-form-new-action')"
-  page.send :record, "Form.reset('todo-form-new-action-lightbox');Form.focusFirstElement('todo-form-new-action-lightbox')"
-  page.insert_html :bottom, "p#{@item.project_id}", :partial => 'todo/item', :locals => { :parent_container_type => "project" }
-  page.visual_effect :highlight, "item-#{@item.id}-container", :duration => 3
-  page.hide "p#{@item.project_id}empty-nd" # If we are adding an new action, the uncompleted actions must be > 0
-else
-  page.show 'status'
-  page.replace_html 'status', "#{error_messages_for('item')}"
-end
\ No newline at end of file