Cleaning up logic when submitting a Recovery Baseline