Add const to argument of push_cleanup
Remove unnecessary variable
Merge branch 'fix-non-const-argument' into graceful-exit
Aggregate cleanup functions