removed deprecated files
Merge branch 'testing' into 'master'