Delete some old files
Merge branch 'newfeatures'