Remove unsed check for simulator

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