cleanups in neuralnets
Merge pull request #2203 from khalednasr/develop

cleanups in neuralnets