Removed some dead Simulator code.