move unused simulator code out the way