- Removed spurious dependence on nnf