Reorganize deletion of models