Nuke NFC for now
Partially Revert "Remove idd"

This reverts commit c424d124bd8987408ffb25dc1a00aaa87561116e.
Fix storage