fixup! Simplify disposal of some resources
fixup! Simplify disposal of some resources