additional vendor cleanups