Cleanup and simplify routing specs