Cleanup implementations of ConfirmationModal and WizardModal