diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index d88815311..e2728f0c5 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -612,32 +612,6 @@ class CoursesController < ApplicationController
     end
   end
 
-  def homework
-    if @course.is_public != 0 || User.current.member_of_course?(@course) || User.current.admin?
-      bids = @course.homeworks.order('created_on DESC')
-      bids = bids.like(params[:name]) if params[:name].present?
-      @bids = paginateHelper bids,10
-      @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
-      @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-   end
-
-  # 新建作业
-  def new_homework
-    @homework = Bid.new
-    @homework.safe_attributes = params[:bid]
-    @homework.open_anonymous_evaluation = 1
-    @homework.deadline = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] ))
-      render :layout => 'base_courses'
-    else
-      render_403
-    end
-  end
-
   def toggleCourse
     @course_prefs = Course.find_by_extra(@course.extra)
     unless (@course_prefs.teacher == User.current || User.current.admin?)
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
deleted file mode 100644
index 32728adf0..000000000
--- a/app/views/courses/homework.html.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="project_r_h">
-  <h2 class="project_h2">
-    <%= l(:label_homework)%>
-  </h2>
-</div>
-<div class="talk_top">
-  <p class="fl">
-    <%= l(:label_totle)%><span><%= @obj_count%></span><%= l(:label_homework_count)%>
-  </p>
-  <%= link_to( l(:label_course_homework_new), new_homework_course_path(@course), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
-  <div class="cl"></div>
-</div>
-<% @bids.each do |bid|%>
-    <div class="problem_main">
-      <%= link_to(image_tag(url_to_avatar(bid.author), :width => "42", :height => "42"), user_path(bid.author), :class => "problem_pic fl") %>
-      <div class="problem_txt fl mt5">
-        <%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author),:class => 'problem_name fl') %>
-        <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
-        <%= link_to(bid.name, course_for_bid_path(bid), :class => 'problem_tit fl fb c_dblue') %>
-        <div class="cl mb5"></div>
-        <p class="fl "><%= l(:lebel_homework_commit)%> ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )</p>
-        <% if @is_teacher%>
-            <%= bid_anonymous_comment(bid)%>
-            <% if bid.homeworks.empty? %>
-            <%= link_to(l(:button_delete),bids_homework_path(:id => bid.id), :method => :delete, :confirm => l(:label_delete_confirm), :class => "fr mr10 work_edit") %>
-            <% end %>
-            <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %>
-        <% elsif @is_student%>
-            <%= student_anonymous_comment bid %>
-            <%= student_new_homework bid %>
-        <% end %>
-        <div class="cl"></div>
-        <script>
-            $(function(){if($("#bid_description_<%= bid.id%>_content").height()>360){$("#bid_show_more_des_button<%= bid.id%>").show();}});
-        </script>
-        <div  id="bid_description_<%= bid.id%>" class="news_description mt5">
-          <div id="bid_description_<%= bid.id%>_content" class="upload_img">
-            <%= bid.description.html_safe %>
-          </div>
-        </div>
-        <div class="news_foot c_red" id="bid_show_more_des_button<%= bid.id%>" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;display: none;">
-          <%= l(:button_more)%>...
-          <span class="g-arr-down"></span>
-        </div>
-        <span class="fl"><%= l(:label_end_time)%>：<%= bid.deadline%></span>
-        <% if betweentime(bid.deadline) < 0 %>
-            <span class='fr mr10 c_red '>
-              <%= l(:label_commit_limit)%>
-            </span>
-        <% else %>
-            <script type="text/javascript">
-                window.setInterval(function(){show_bid_dead_line(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"bid_deadline_<%= bid.id%>");},1000)
-            </script>
-            <div id="bid_deadline_<%= bid.id%>">
-            </div>
-        <% end %>
-      </div>
-      <div class="cl"></div>
-    </div>
-<% end%>
-
-<ul class="wlist">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-<div class="cl"></div>
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb
deleted file mode 100644
index 9ec73d519..000000000
--- a/app/views/courses/new_homework.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= labelled_form_for @homework, :html => { :multipart => true }, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %>
-	<%= render :partial => 'bids/new_homework_form', :locals => { :bid => @homework,:bid_id => "new_bid",:f => f,:edit_mode => false } %>
-<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 8aab06ccc..bd4464458 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,9 +26,6 @@
 # Example: :via =>  :get ====> :via => :get
 
 RedmineApp::Application.routes.draw do
-
-  #match '/discuss_demos/new',:to => 'discuss_demo#create',:via =>[:post]
-  #match '/discuss_demo/show',:to => 'discuss_demo#show'
   mount Mobile::API => '/api'
 
   resources :homework_users
@@ -146,13 +143,6 @@ RedmineApp::Application.routes.draw do
     end
   end
 
-  #resources :notificationcomments do
-  #
-  #end
-
-  #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
-  # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     resources :contestnotifications do
@@ -195,13 +185,6 @@ RedmineApp::Application.routes.draw do
   match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put]
   match '/contestnotifications/preview', :to => 'previews#contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]
 
-  #resource :previews, only: [] do
-  #  collection do
-  #    match 'news', :via => [:get, :post, :put]
-  #    match 'issue', :via => [:get, :post, :put]
-  #  end
-  #end
-
   resources :stores do
     collection do
       match 'search', :via =>  [:get, :post]
@@ -274,7 +257,7 @@ RedmineApp::Application.routes.draw do
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
   post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
   # boards end
-  delete 'bids/homework', :to => 'bids#homework_destroy'
+  # delete 'bids/homework', :to => 'bids#homework_destroy'
 
   # Misc issue routes. TODO: move into resources
   match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
@@ -306,7 +289,6 @@ RedmineApp::Application.routes.draw do
       match 'user_projects', :to => 'users#user_projects',  :via => :get
       match 'user_activities', :to => 'users#user_activities',  :via => :get, :as => "user_activities"
       match 'user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "user_newfeedback"
-      # match 'watch_calls', :to => 'users#watch_bids', :via => [:get , :post]
       match 'info', :to => 'users#info', :via => [:get , :post], :as => 'user_info'
       match 'user_watchlist', :to => 'users#user_watchlist',  :via => :get, :as => "user_watchlist" #add by huang
       match 'user_fanslist', :to => 'users#user_fanslist',  :via => :get, :as => "user_fanslist" #add by huang
@@ -340,7 +322,6 @@ RedmineApp::Application.routes.draw do
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
   match 'users/:id/user_projects', :to => 'users#user_projects',  :via => :get
-  #match 'user/:id/watch_calls', :controller => 'users', :action => 'watch_bids', :via => [:get , :post]
 
   #end
   match 'my/account',  :via => [:get, :post]
@@ -395,9 +376,6 @@ RedmineApp::Application.routes.draw do
       get 'invite_members_by_mail', :action=> 'invite_members_by_mail'
       get 'send_mail_to_member', :action => 'send_mail_to_member'
       match 'user_watcherlist', :to => 'projects#watcherlist',  :via => :get, :as => "watcherlist" #add by huang
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
-      #get 'news', :action => 'news', :as => 'news'
       #end
       post 'modules'
       post 'archive'
@@ -415,19 +393,7 @@ RedmineApp::Application.routes.draw do
     match '/member', :to => 'projects#member',  :as => 'member', :via => :get
     match '/file', :to => 'projects#file',  :as => 'file', :via => :get
     match '/statistics', :to => 'projects#statistics',  :as => 'statistics', :via => :get
-    #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
-    match '/homework', :to => 'projects#homework', :as => 'homework', :via => :get
-    
-    #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
-    #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
-    #   match '/', :controller => 'projects', :action => 'show', :as => 'project_show', :via => :get
-    #   get 'projects/:project_id/show', :to => 'projects#show', :as => 'project_show'
-    #   get 'projects/:project_id/repository', :to => 'repositories#show', :as => 'project_repository'
-
-    #   match '/show', :controller => 'projects', :action => 'show',  :as => 'project_show', :via => :get
     match '/watcherlist', :to=>'projects#watcherlist', :as => 'watcherlist', :via => :get  #add by huang
-    # matche '/news', :controller => 'news', :action => 'index', :as => 'news', :via => :get
-    #end
 
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
       collection do
@@ -698,8 +664,6 @@ RedmineApp::Application.routes.draw do
     member do
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
       get 'search_member', :action => 'search_member'
-      get 'homework', :action => 'homework', :as => 'homework'
-      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
       get 'file', :action => 'file', :as => 'file'
       get 'feedback', :action => 'feedback', :as => 'course_feedback'
       get 'member', :controller => 'courses', :action => 'member', :as => 'member'
@@ -771,7 +735,6 @@ RedmineApp::Application.routes.draw do
   match 'delete_avatar', :to => 'avatar#delete_image',:via => :post
   # Endof Tao's code
   get 'robots.txt', :to => 'welcome#robots'
-  #match 'welcome/course', :to => 'welcome#course'
   ##############测试留言功能    fq
   post 'words/new', :to => 'words#new'
   post 'words/create', :to => 'words#create'
@@ -782,66 +745,21 @@ RedmineApp::Application.routes.draw do
   get 'words/more', :to => 'words#more'
   get 'words/back', :to=> 'words#back'
   get 'words/destroyJournal', :to => 'words#destroyJournal'
-  ############## fq
-  # post 'calls/create', :to => 'bids#create'
-  # delete 'calls/destroy', :to => 'bids#destroy'
-  # match 'calls/new', :to => 'bids#new', :via => [:get , :post]
-  # get 'calls/more', :to => 'bids#more'
-  # get 'calls/back', :to=> 'bids#back'
-  # match 'calls/new_bid', :to => 'bids#new_bid'
-  # match 'contest/new_contest', :to => 'bids#new_contest' #huang
-  # match 'calls/:id/show_project', :to => 'bids#show_project', :as => 'project_for_bid'
-  # match 'calls/:id/show_course', :to => 'bids#show_courseEx', :as => 'course_for_bid'  # nwb added
-  # match 'calls/:id/new_exercise_book', :to => 'homework_attach#new', :as => 'new_exercise_book'
-  # match 'calls/:id/add', :to => 'bids#add'
-  # match 'calls/:id/delete', :to => 'bids#delete'
-  # match 'calls/:id/add_homework', :to => 'bids#add_homework', :via =>  :post
-  # match 'calls/:id/new_submit_homework', :to => 'bids#new_submit_homework', :via =>  :get, :as => 'new_submit_homework'
   match 'words/add_project_respond', :to => 'words#add_project_respond'
   match 'words/:id/leave_project_message', :to => 'words#leave_project_message'
-
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
-  # match 'calls/create_bid', :to => 'bids#create_bid'
-  # match 'contest/create_contest', :to => 'bids#create_contest' #huang
-  # match 'calls/create_homework', :to => 'bids#create_homework'
-  # match 'calls/:id/homework_respond', :to => 'bids#homework_respond'
-  # match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
-  # match 'calls/:id/fork', :to => 'bids#fork', :as => 'fork'
-  # match 'calls/:id/create_fork', :to => 'bids#create_fork'
-  #
-  # match 'calls/:id/show_course', :to => 'bids#show_course', :as => 'show_course'
-  # match 'calls/:id/show_bid_project', :to => 'bids#show_bid_project', :as => 'show_bid_project'
-  # match 'calls/:id/show_bid_user', :to => 'bids#show_bid_user', :as => 'show_bid_user'
-
   match 'project/:id/share', :to => 'projects#share', :as => 'share_show' #share
 
   post 'join_in/join', :to => 'courses#join', :as => 'join'
   delete 'join_in/join', :to => 'courses#unjoin'
   post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
   delete 'join_in/join_group', :to => 'courses#unjoin_group'
-  # post 'calls/:id/join_in_contest', :to => 'bids#join_in_contest', :as => 'join_in_contest'
-  # delete 'calls/:id/join_in_contest', :to => 'bids#unjoin_in_contest'
-  # match 'calls/:id/show_participator', :to => 'bids#show_participator'  # bai
-  # match 'calls/:id/update_contest', :to => 'bids#update_contest'    # bai
-  # match 'calls/:id/settings', :to => 'bids#settings'    # bai
 
   delete 'attachment/:id', :to => 'attachments#delete_homework'
   match 'new_join', :to => 'courses#new_join', :as => 'try_join'
   match 'new_join_group', :to => 'courses#new_join_group', :as => 'try_join_group'
   # match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
-  # match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post]
-
-
-  #added by william
-  # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results'
-  # match 'calls/:id/set_prizes',:controller => 'bids',:action => 'set_prizes',:as => 'set_prizes'
-  # match 'calls/:id/set_reward',:to => 'bids#set_reward',:as => 'set_reward'
-
-  # added by young
-  # match 'calls', :to => 'bids#index'
-  #
-  # match 'calls/:id', :to => 'bids#show', :as => 'respond'
 
   ########################
   ##added by wen##########
@@ -849,7 +767,6 @@ RedmineApp::Application.routes.draw do
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
   get 'school/:school_id', to: 'welcome#course', :as => 'school_course_list'
-  #get 'course/:school_id', to: 'welcome#course'
   post 'school/get_options/:province', :to => 'school#get_options'
   get 'school/get_options/:province', :to => 'school#get_options'