Remove a few confusing methods, bubble up router exception.
small refactor