Remove legacy routing