Removing MPS for a second
Adding MPS back in
removing bad submodule mapping