Revert "Delete by type"

This reverts commit b07f6f7a6b1e73e5f3bc406dd2306ab7158be1f8.