more vendor code removal