Keep vendor tidy