I prefer dismantlement when it comes to the FBI.
That organization was started by J Edgar Hoover as a library of blackmail from the get-go. Just read his biography.
I bet that they still do some good. Difficult to tell since we are not allowed to know all of their activities good or bad.
Any government entity cannot be trusted with absolute, unchecked, power. Seems like the checks and balances have failed. Then again, maybe there was punishment for all involved in the FISA mess and we simply don’t know about it. However, the key participants in it seem to have been given a free stay out of jail pass.