striking paragraph (2), (B) by striking Deficiency .— and all that follows through The running and inserting Deficiency .—The running , and (C) by striking income, estate, gift and . (16) Section 6503 is amended by striking subsections (e), (f), (i), and (k) and by redesignating subsections (g), (h), and (j) as subsections (e), (f), and (g), respectively. (17) Section 6511 is amended by striking subsections (d) and (i) and by redesignating subsections (f) and (h) as subsections (d) and (e), respectively. (18) Section 6512(b)(1) is amended by striking of income tax for the same taxable year, of gift tax for the same calendar year or calendar quarter, of estate tax in respect of the taxable estate of the same decedent or . (19) Section 6513 is amended— (A) by striking (a) Early Return or Advance Payment of Tax .— , and (B) by striking subsections (b) and (e). (20) Chapter 67 is amended by striking subchapters A through D and inserting the following: 6601. Interest on overpayments and underpayment (a) Underpayments If any amount of tax imposed by this title is not paid on or before the last date prescribed for payment, interest on such amount at the Federal short-term rate (as defined in section 511(b)) shall be paid from such last date to the date paid. (b) Overpayments Interest shall be allowed and paid upon any overpayment in respect of any internal revenue tax at the Federal short-term rate (as defined in section 511(b)) from 60 days after the date of the overpayment until the date the overpayment is refunded. . (21) Section 6651(a)(1) is amended by striking subchapter A of chapter 61 (other than part III thereof, . (22) Section 6656 is amended by striking subsection (c) and by redesignating subsections (d) and (e) as subsections (c) and (d), respectively. (23) Section 6663 is amended by striking subsection (c). (24) Section 6664(c) is amended— (A) by striking Exception.— and all that follows through No penalty and inserting Exception.—No penalty , and (B) by striking paragraphs (2), (3), and (4). (25) Chapter