route redir cleanup WIP

Totally works, just need to get tests passing and decide if it is
worth it.