Minor cleanup to simulator
Minor cleanup to simulator

Change-Id: I3be9a4313c14b251f72f953d21d41d07d291d17c
Reviewed-on: https://robertou.com/gerrit/372
Tested-by: Jenkins CI
Reviewed-by: Robert Ou <6265f2953535a346b7ba7418c552b02d288905ed@pioneers.berkeley.edu>

jarzofjam/tenshi,pioneers/tenshi,jessicakam/tenshi,pioneers/tenshi,SamboyKirk/tenshi,hozhu123/tenshi,chuen0630/tenshi,chuen0630/tenshi,jessicakam/tenshi,JaronArmiger/tenshi,abhishyantkhare/tenshi,chuen0630/tenshi,SamboyKirk/tenshi,jarzofjam/tenshi,abhishyantkhare/tenshi,JaronArmiger/tenshi,cduck/tenshi,cduck/tenshi,tobinsarah/tenshi,jarzofjam/tenshi,tobinsarah/tenshi,zentner-kyle/tenshi-old,hozhu123/tenshi,tobinsarah/tenshi,tobinsarah/tenshi,zentner-kyle/tenshi-old,SamboyKirk/tenshi,tobinsarah/tenshi,jarzofjam/tenshi,zentner-kyle/tenshi-old,JaronArmiger/tenshi,hozhu123/tenshi,JaronArmiger/tenshi,cduck/tenshi,abhishyantkhare/tenshi,tobinsarah/tenshi,cduck/tenshi,jarzofjam/tenshi,hozhu123/tenshi,jessicakam/tenshi,SamboyKirk/tenshi,JaronArmiger/tenshi,chuen0630/tenshi,pioneers/tenshi,pioneers/tenshi,cduck/tenshi,abhishyantkhare/tenshi,hozhu123/tenshi,jessicakam/tenshi,jessicakam/tenshi,jessicakam/tenshi,zentner-kyle/tenshi-old,hozhu123/tenshi,SamboyKirk/tenshi,pioneers/tenshi,SamboyKirk/tenshi,jessicakam/tenshi,zentner-kyle/tenshi-old,JaronArmiger/tenshi,zentner-kyle/tenshi-old,hozhu123/tenshi,abhishyantkhare/tenshi,cduck/tenshi,tobinsarah/tenshi,SamboyKirk/tenshi,abhishyantkhare/tenshi,jarzofjam/tenshi,chuen0630/tenshi,jarzofjam/tenshi,chuen0630/tenshi,chuen0630/tenshi,pioneers/tenshi,abhishyantkhare/tenshi,cduck/tenshi,JaronArmiger/tenshi,pioneers/tenshi