The only way to end it is to totally defund NSA. Then NSA would still exist, probably as a minor division in the FDA or somthing, with a "black budget" hidden in other budget items but it would have to prioritize.
If it can be done and the resources are available it will be done.
I agree with defunding and disbanding the NSA, but they will argue they are absolutely necessary to the security of the United States.