I’d rather abolish the FIB entirely. It is hopelessly corrupt.
It was created by executive order, so it could be eliminated the same way. Teddy Roosevelt's AG created the FBI, so Roosevelt could investigate his opponents in Congress who he suspected of being involved in illegal land deals.