Removed mpc stuff for submodule change