Remove vendor stuff from here