removed old modules file
Merge branch 'dev'