WIP clean up route

Signed-off-by: Amadeu Tolentino <amadeu.tolentino@gmail.com>