Remove nconf dependency.
Cleanup