more predictable clean-up behaviour