Suppression de code mort
Merge branch 'master' into collisions