Eliminate the FBI and CIA; replace with new, narrowly scoped organizations.
Threats that would but confirm the need to scrap them. Neither has a KGB-type mission. Neither was promulgated to spy on the American Public. Neither was charged with bringing to ‘justice’ those whose only infraction was to criticize administrative power.
Will it be easy? Nope.
Is it still necessary? You betcha!