Retirement tax questions

@MaryK4 So do we need to do both steps? File a 1099-R with code P and add the excess contribution as miscellaneous income?