Cleaned up vendor stuff