Delete old files
Remove old files
WTF??? Now really remove old files
Merge remote-tracking branch 'origin/master'