Fixed dataset and type deletion