Goodbye msim

Change-Id: Ia417f68008760985d95ae66bc6d3836cd7bee28a