cleaned up simulator