Revert "Improve routes"

This reverts commit 9f8e6f841d7a062e237b8ea54093bfa065995952.