No need for the FBI.
FBI should be complete disbanded, its employees forever barred from any government service of any kind.
A new agency, strictly investigative with absolutely zero enforcement or arrest powers, should be stood up to assist State peace officers with investigating interstate crimes.