Remove old code
Stay with current route when possible