Merge "Delete code that checks for the simulator, it's long gone." into mnc-dev