Changes for nnz removal.