* removed nf constants
* removed nf constants from stubs