rm some files
Merge branch 'dev-bryan'