Be marginally more careful about removing objects