remove creating an extra Promise just for common cleanup (#4339)

* remove creating an extra Promise just for common cleanup

* Apply suggestions from code review

fix tests

---------

Co-authored-by: Aras Abbasi <[email protected]>

Author: bmeck