Remove unsed check for simulator

Change-Id: I46f134d960db330e7b6e7dbfebc84d602d3a3466
Merge "Remove unsed check for simulator"