Remove useless files
Sync with master