Removed obsolete software
Merge branch 'dev'