Remove some files not used
Merge branch 'master_v2' into master_oct8