Cleanup helpers [skip ci]