Fix routing issue

- Remove static routing as it was too greedy and not yet needed.
- Fix some variable names as well.