Cleanup, move from cm vendor to vendor velox