; (2) by striking paragraphs (2) and (3); and (3) by redesignating paragraphs (4) and (5) as paragraphs (2) and (3), respectively. (e) Section 931 of the Energy Policy Act of 2005 ( 42 U.S.C. 16231 ) is amended— (1) in subsection (a)(2)— (A) by striking subparagraph (A); and (B) by redesignating subparagraphs (B) through (E) as subparagraphs (A) through (D), respectively; (2) by striking subsection (d); and (3) by redesignating subsections (e) through (g) as subsections (d) through (f), respectively. (f) Sections 606 and 607 of the Energy Independence and Security Act of 2007 ( 42 U.S.C. 17174 , 17175) are repealed. 5. Savings provision The repeal of the Solar Energy Research, Development, and Demonstration Act of 1974 ( 42 U.S.C. 5551 et seq.) under section 4(a) shall not affect the authority of the Secretary to conduct research and development on solar energy.