Removed a useless class?
Fixed the problems with simulator.  Turned off the skip tests