removed some sources of non-deterministic behavior from the system