Prototype: Cleanup routing