Merge "Remove unsed check for simulator"