Additional validation & more control over cleanup
Additional validation & more control over cleanup

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus