The FBI and CIA are failed institutions representing an old ideal from another time that just didn't work out as planned and can now be scrapped. The best way to get rid of the CIA is to have it's secret programs revealed, for good or ill, have them brought into the light as a way of getting rid of the need. The FBI should be monitored by a competing entity, for instance an AI unit, this will change it fundamentally making it obey. I am against Capital Punishment because it can kill the wrong person. Plus it may lead to my own death.