simplify routing

This was pretty easy and seems to just work!