Return the FBI to a purely "investigative" agency.
The Federal Bureau of Investigation needs to concentrate it's efforts on just that.. Investigation.
Office politics can and does get in the way of investigation and enforcement duties, and can influence the outcome of an investigation, leading to "enforcement" on the wrong parties, or "evidence" that has been compromised by political expediency.
Likewise, BATFE needs to concentrate on tax collection and making sure proper forms are provided, completed, as well as inspections.
As stated in the article, BATFE has had quite a history of scandals and most of those are in the area of enforcement.
Therefore, to reduce the problem, transfer the enforcement responsibility out of the BATFE and to another agency.
If there MUST be a federal law enforcement agency, let it be ONE AGENCY.
I suggest the U.S. Marshall's office, which would be responsible for all "armed enforcement actions".
All other agencies responsible for armed enforcement activities would become subordinate agencies of the U.S. Marshall's service, consolidating a myriad of rules and regulations to one federal standard, and reducing the chain of commmand, and chain of responsibility to one single heirarchy.
Then, we can get rid of the Homeland Security Office.