cleanup
more cleanup and mcv work