major cleanup of mpar code