There is a simple solution.
Cut the ATF budget appropriation 20% each year until ATF management solvers their own problems.
Cut it 100% Disband it all. Vote in the sheriffs and let communities decide how much policing they want to pay for in the form of deputies and such. No more fed anything. No FBI either. The evil they do far outweigh any good (if any).
Simpler. Eliminate ATF entirely. And arrest any involved in what was nothing more than an assassination. From what I read before, this guy was involved in the Little Rock airport and likely had info about the Klintons.