Goodbye msim

Change-Id: I54954c64ec7e521c9547abfa2c584493b04c8c26