Remove or add a custom form functionality during the Attach a Template process

Currently, you can remove any pre-attached custom forms or add more custom forms during the project creation step. I would like to see this same functionality to the attach a template process. We have built our template with a "deconstructive" approach and that includes multiple custom forms with the user instructed to remove any forms not needed. We would like to be able to have them do that during the attachment process and not have to remember to go back to remove those forms after the fact.