The surveillance will never go away.
They will just change the name of the program, assign it to another branch or agency, and carry on....
Government spying on citizens has been going on for years.
MkUltra came from an earlier program, and morphed into the current ones via other intermediate programs.
Congress yelled at the Intel community for it, they “promised” with a wink, nod, and crossed fingers that they wouldn’t do it again.
Henh.