[BUG #6968] fixed @ignore's in Simulator
[BUG #6968] clean up unused code