Remove vendors
Some changes