Remove routes
Merge branch 'working'