Route nesting cleanup