Comment out unused mwrapper functions for now