Remove Msim

Change-Id: I42426210ffa58d40b87f4718cc9a74053f014f76