remove mvs keywords from setup