Remove Nullable functions from TODO