Remove the federal government's Gestapo, return authority and agency to individual states, and at most create a small group dedicated to doing paperwork facilitating the handshakes required for interstate law enforcement efforts.

(One of) the FBI's initial stated purpose was to prevent someone from hopping state lines and getting away, but not only is that redundant (marshals) it's unnecessary if states aren't compromised and cooperate as they're supposed to.