Cleanups in Vector still going strong