Remove unused files
Merge origin/master