Remove Msim

Change-Id: I9fe4bfc64081e43751f3c31fea4e17f35fd16f17