Cleanup for routes.rb
Merge branch 'Klopsch'