* Migrate to new delete by type and key