No more automagic cleanup