They don't need to go away, they can just be neutered. There were two massive cutbacks in spy agencies in the last 50 years, having a third is not a fantasy.
"I can make this organization by and for evil people marginally better by joining it and being less evil" isn't exactly a new idea either but hasn't aged well.