mscv warning cleanup