Revert "Revert "Delete by type""

This reverts commit 15612ff9fb50f037fabbf34373efe5df5f13ee0b.