c295e4f215
* Add support for S3 cleanup + standardize firing cleanup. Closes #2646 * fix: manually fix post-merge