Not later than 2 years after
October 17, 1998, the Secretary shall terminate any waiver of charges under section 33 of the Atomic Energy Act of 1954 (
42 U.S.C. 2053) that were made before such date, unless the Secretary determines that such waiver should be continued.