Revert "reduce complexity in SensorSimulator"

This reverts commit da20b2a22bdf04b0a79452f74a0990e4290c7423.