Removes deprecated scripts
Merge branch 'master' into drobofs