Remove legacy support