removed dead classes from simulator