Is this needed for the `destroy` functionality? I guess this should be removed and be a separate change for #110