clean up unnecessary class vars in simulator