Retirement tax questions

I have a couple of other questions/clarifications after going through the balance of the tax prep using the instructions provided in this thread. Seemed to work OK but had a little glitch with the state return (CA) where some entries were not made automatically. Think I got it figured out, fingered crossed.

 

Question/Clarification 1: When creating and entering the self-created 1099-R for the excess contribution return, the program asks whether it is a CORRECTED or SUBSTITUTE document. I indicated "neither" but started wondering if that was correct since the description of a "substitute 1099-R form" was used to describe the self-created 1099-R in the instructions within this subject thread.  Should the self-created 1099-R entered this year be indicated as a "substitute" when entered into the tax program since the account custodian will not release the true 1099-R til 2025 for the returned excess contribution?

 

Question/Clarification 2: Prior to asking my initial question last week, I stopped preparing my return after filling out the IRA section and discovering the non-allowable contribution. At that time, I apparently went back to the beginning of the IRA section and deselected making a Roth IRA contribution which caused the tax software to ask if I wanted to delete all entries in the section, which I did until I could find out more here. In restarting my return, I did not enter anything back into the IRA contribution section because the contribution was being removed from the Roth IRA account with any earnings "like it didn't happen". Was it OK to remove the initial Roth IRA contribution report from the tax return or should it have been entered again upon restarting the return? It was implied in the instructions above that it didn't matter but I wanted to make sure that no extraneous information was left behind in the return that would cause a problem even though I indicated that all entries in the section should be deleted.

Again, great thanks for your reply for this invaluable information.