Removing unused methods and updating routes.rb
Merge remote-tracking branch 'origin/rails4' into rails4