cleanup and vendor update