Or just do away with it and not replace it, seeing as how we managed fine for over 100 years without the OSS/CIA. Then we can do the same with the NSA, FBI, ATF, DEA, and every other unlawful regulator.