* Revert "[Cleanup] Hotfix for [p]cleanup after (#2004)" This reverts commit 7959654dc8. * refactor cleanup * formatting pass * put back in try/except block
7959654dc8