cleaning mvs based on lu-zero's work