Be more specific
Remove old routing code and add a missing type annotation