clean up, bugfix vendor