Dissolve both of these hopelessly corrupted agencies.
Give foreign intelligence over to the military.
Expand the US Marshall service to cover whatever actually legitimate activities the FBI does.
And while we’re on the subject, why does BATFE exist?
You’re quick... :)