Deleted useless files
Merge remote-tracking branch 'origin/jose' into dev