They need to start with an apology from Wray, then an appointment of his replacement and a full house cleaning.
House cleaning for the FBI?
Start by moving it somewhere away from DC. Somewhere they can interact with the people they are supposed to serve. Like maybe a military community. I am thinking Minot N.D. Let Wray continue in a mandatory consulting and apologizing role in Minot, N.D. for at least 2 winters. Let all the (95% agents) know why they are in Minot when Wray is done apologizing.
Moving the DOJ to Leavenworth Kansas also seem appropriate.
IRS= North Platte Nebraska.
EPA= Western Iowa.
Department of Agriculture= Omaha Nebraska
CIA= Helena Montana.
I think draining the swamp starts by having Government reconnect with the people.