Refactoring + suppression de vendor inutile