Update references to DNN 6
Fix obsolete code from DNN 6 upgrade
Merge pull request #3 from bdukes/DNN6

DNN 6