Remove unnecessary routes
Merge branch 'master' into stylus