Eliminate BATFE and roll their duties and agents over to the FBI. It would eliminate a lot of unnecessary managerial positions and steamline investigations.
End the prohibition against the production of whiskey by individuals for their own use. Then eliminate the Bureau of Alcohol, Tobacco, Firearms and Explosives (BATFE). Firearms are legal, tobacco is legal, and then all alcohol would be legal. Why do we have the BATFE again?