Revert "add KDXNullSafe"

This reverts commit 23f5cd25121311f59b1899e21fa2e6432220e1fa.